aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tensorflow/g3doc/api_docs/python/contrib.framework.md4
-rw-r--r--tensorflow/g3doc/api_docs/python/framework.md9
-rw-r--r--tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.convert_to_tensor.md6
-rw-r--r--tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.convert_to_tensor_or_indexed_slices.md3
-rw-r--r--tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.contrib.framework.convert_to_tensor_or_sparse_tensor.md4
5 files changed, 8 insertions, 18 deletions
diff --git a/tensorflow/g3doc/api_docs/python/contrib.framework.md b/tensorflow/g3doc/api_docs/python/contrib.framework.md
index 9b4f44ad74..0b8690cf2d 100644
--- a/tensorflow/g3doc/api_docs/python/contrib.framework.md
+++ b/tensorflow/g3doc/api_docs/python/contrib.framework.md
@@ -58,7 +58,7 @@ Assert `tensor` is 0-D, of type `tf.int32` or `tf.int64`.
- - -
-### `tf.contrib.framework.convert_to_tensor_or_sparse_tensor(value, dtype=None, name=None, as_ref=False)` {#convert_to_tensor_or_sparse_tensor}
+### `tf.contrib.framework.convert_to_tensor_or_sparse_tensor(value, dtype=None, name=None)` {#convert_to_tensor_or_sparse_tensor}
Converts value to a `SparseTensor` or `Tensor`.
@@ -70,8 +70,6 @@ Converts value to a `SparseTensor` or `Tensor`.
* <b>`dtype`</b>: Optional element type for the returned tensor. If missing, the
type is inferred from the type of `value`.
* <b>`name`</b>: Optional name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if we want the result as a ref tensor. Only used if a new
- `Tensor` is created.
##### Returns:
diff --git a/tensorflow/g3doc/api_docs/python/framework.md b/tensorflow/g3doc/api_docs/python/framework.md
index d09acc4dee..707bab69ad 100644
--- a/tensorflow/g3doc/api_docs/python/framework.md
+++ b/tensorflow/g3doc/api_docs/python/framework.md
@@ -2518,7 +2518,7 @@ for more details.
- - -
-### `tf.convert_to_tensor(value, dtype=None, name=None, as_ref=False, preferred_dtype=None)` {#convert_to_tensor}
+### `tf.convert_to_tensor(value, dtype=None, name=None, preferred_dtype=None)` {#convert_to_tensor}
Converts the given `value` to a `Tensor`.
@@ -2552,8 +2552,6 @@ and scalars in addition to `Tensor` objects.
* <b>`dtype`</b>: Optional element type for the returned tensor. If missing, the
type is inferred from the type of `value`.
* <b>`name`</b>: Optional name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if we want the result as a ref tensor. Only used if a new
- `Tensor` is created.
* <b>`preferred_dtype`</b>: Optional element type for the returned tensor,
used when dtype is None. In some cases, a caller may not have a
dtype in mind when converting to a tensor, so preferred_dtype
@@ -2562,7 +2560,7 @@ and scalars in addition to `Tensor` objects.
##### Returns:
- A `Tensor` based on `value`.
+ An `Output` based on `value`.
##### Raises:
@@ -2573,7 +2571,7 @@ and scalars in addition to `Tensor` objects.
- - -
-### `tf.convert_to_tensor_or_indexed_slices(value, dtype=None, name=None, as_ref=False)` {#convert_to_tensor_or_indexed_slices}
+### `tf.convert_to_tensor_or_indexed_slices(value, dtype=None, name=None)` {#convert_to_tensor_or_indexed_slices}
Converts the given object to a `Tensor` or an `IndexedSlices`.
@@ -2589,7 +2587,6 @@ unmodified. Otherwise, it is converted to a `Tensor` using
* <b>`dtype`</b>: (Optional.) The required `DType` of the returned `Tensor` or
`IndexedSlices`.
* <b>`name`</b>: (Optional.) A name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if the caller wants the results as ref tensors.
##### Returns:
diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.convert_to_tensor.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.convert_to_tensor.md
index 61c42979b2..226e01ead0 100644
--- a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.convert_to_tensor.md
+++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.convert_to_tensor.md
@@ -1,4 +1,4 @@
-### `tf.convert_to_tensor(value, dtype=None, name=None, as_ref=False, preferred_dtype=None)` {#convert_to_tensor}
+### `tf.convert_to_tensor(value, dtype=None, name=None, preferred_dtype=None)` {#convert_to_tensor}
Converts the given `value` to a `Tensor`.
@@ -32,8 +32,6 @@ and scalars in addition to `Tensor` objects.
* <b>`dtype`</b>: Optional element type for the returned tensor. If missing, the
type is inferred from the type of `value`.
* <b>`name`</b>: Optional name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if we want the result as a ref tensor. Only used if a new
- `Tensor` is created.
* <b>`preferred_dtype`</b>: Optional element type for the returned tensor,
used when dtype is None. In some cases, a caller may not have a
dtype in mind when converting to a tensor, so preferred_dtype
@@ -42,7 +40,7 @@ and scalars in addition to `Tensor` objects.
##### Returns:
- A `Tensor` based on `value`.
+ An `Output` based on `value`.
##### Raises:
diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.convert_to_tensor_or_indexed_slices.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.convert_to_tensor_or_indexed_slices.md
index 0c65e8327c..18cf6c58be 100644
--- a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.convert_to_tensor_or_indexed_slices.md
+++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.convert_to_tensor_or_indexed_slices.md
@@ -1,4 +1,4 @@
-### `tf.convert_to_tensor_or_indexed_slices(value, dtype=None, name=None, as_ref=False)` {#convert_to_tensor_or_indexed_slices}
+### `tf.convert_to_tensor_or_indexed_slices(value, dtype=None, name=None)` {#convert_to_tensor_or_indexed_slices}
Converts the given object to a `Tensor` or an `IndexedSlices`.
@@ -14,7 +14,6 @@ unmodified. Otherwise, it is converted to a `Tensor` using
* <b>`dtype`</b>: (Optional.) The required `DType` of the returned `Tensor` or
`IndexedSlices`.
* <b>`name`</b>: (Optional.) A name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if the caller wants the results as ref tensors.
##### Returns:
diff --git a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.contrib.framework.convert_to_tensor_or_sparse_tensor.md b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.contrib.framework.convert_to_tensor_or_sparse_tensor.md
index cd4e4d5bb7..089f02a9b4 100644
--- a/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.contrib.framework.convert_to_tensor_or_sparse_tensor.md
+++ b/tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.contrib.framework.convert_to_tensor_or_sparse_tensor.md
@@ -1,4 +1,4 @@
-### `tf.contrib.framework.convert_to_tensor_or_sparse_tensor(value, dtype=None, name=None, as_ref=False)` {#convert_to_tensor_or_sparse_tensor}
+### `tf.contrib.framework.convert_to_tensor_or_sparse_tensor(value, dtype=None, name=None)` {#convert_to_tensor_or_sparse_tensor}
Converts value to a `SparseTensor` or `Tensor`.
@@ -10,8 +10,6 @@ Converts value to a `SparseTensor` or `Tensor`.
* <b>`dtype`</b>: Optional element type for the returned tensor. If missing, the
type is inferred from the type of `value`.
* <b>`name`</b>: Optional name to use if a new `Tensor` is created.
-* <b>`as_ref`</b>: True if we want the result as a ref tensor. Only used if a new
- `Tensor` is created.
##### Returns: