diff options
| author |  Jonathan Hseu <jhseu@google.com> | 2016-11-18 15:43:53 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-11-18 16:04:44 -0800 |
| commit | 85eeec0d415a1478bbeffc3d4545c795bee64e9f (patch) | |
| tree | 5d1bb5f7b015f933cdfe8f2d5fc1748d8a7e71f7 /tensorflow/contrib/labeled_tensor | |
| parent | 068e2393edb3f0e43a303cf70c4b3c483b2cde23 (diff) | |
Automated rollback of change 139400135
Change: 139632235
Diffstat (limited to 'tensorflow/contrib/labeled_tensor')
| -rw-r--r-- | tensorflow/contrib/labeled_tensor/python/ops/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/core.py b/tensorflow/contrib/labeled_tensor/python/ops/core.py index fef8f60dc7..870dbdd383 100644 --- a/tensorflow/contrib/labeled_tensor/python/ops/core.py +++ b/tensorflow/contrib/labeled_tensor/python/ops/core.py @@ -519,7 +519,7 @@ LabeledTensorLike = tc.Union(LabeledTensor, ops.Output, np.ndarray, Scalar) def convert_to_labeled_tensor(value, dtype=None, name=None): """Converts the given `value` to a `LabeledTensor`. - This function accepts `LabeledTensor` objects, 0-dimensional `Output` objects + This function accepts `LabeledTensor` objects, 0-dimensional `Tensor` objects and numpy arrays, and Python scalars. Higher dimensional unlabeled tensors must use the `LabeledTensor` constructor explicitly. |