diff options
| author |  Jonathan Hseu <jhseu@google.com> | 2016-11-18 21:01:37 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-11-18 21:22:42 -0800 |
| commit | 3866dd2b20e5b63ad4ea8d0edb7961a2252d906d (patch) | |
| tree | 163e26efe807a892251225ae64a37a49378aab33 /tensorflow/contrib/labeled_tensor | |
| parent | ed0dc84363a6fa6078f679325ac411c76e976e8a (diff) | |
Automated rollback of change 138583261
Change: 139651838
Diffstat (limited to 'tensorflow/contrib/labeled_tensor')
| -rw-r--r-- | tensorflow/contrib/labeled_tensor/python/ops/core.py | 8 | ||||
| -rw-r--r-- | tensorflow/contrib/labeled_tensor/python/ops/ops.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tensorflow/contrib/labeled_tensor/python/ops/core.py b/tensorflow/contrib/labeled_tensor/python/ops/core.py index 870dbdd383..b35745861a 100644 --- a/tensorflow/contrib/labeled_tensor/python/ops/core.py +++ b/tensorflow/contrib/labeled_tensor/python/ops/core.py @@ -279,7 +279,7 @@ class LabeledTensor(object): axes: lt.Axes containing axis names and coordinate labels. """ - @tc.accepts(object, ops.Output, + @tc.accepts(object, ops.Tensor, tc.Union(Axes, tc.Collection(tc.Union(string_types, AxisLike)))) def __init__(self, tensor, axes): """Construct a LabeledTenor. @@ -489,7 +489,7 @@ class LabeledTensor(object): # typecheck type abbreviations: # abbreviations for third-party types with very long reprs tc.register_type_abbreviation(tensor_shape.Dimension, 'tensorflow.Dimension') -tc.register_type_abbreviation(ops.Output, 'tensorflow.Output') +tc.register_type_abbreviation(ops.Tensor, 'tensorflow.Tensor') tc.register_type_abbreviation(dtypes.DType, 'tensorflow.DType') # core LabeledTensor types tc.register_type_abbreviation(Axis, 'labeled_tensor.Axis') @@ -497,7 +497,7 @@ tc.register_type_abbreviation(Axes, 'labeled_tensor.Axes') tc.register_type_abbreviation(LabeledTensor, 'labeled_tensor.LabeledTensor') -@tc.returns(ops.Output) +@tc.returns(ops.Tensor) @tc.accepts(LabeledTensor) def _convert_labeled_tensor_to_tensor(value, *args, **kwargs): # call ops.convert_to_tensor to handle optional arguments appropriately @@ -510,7 +510,7 @@ ops.register_tensor_conversion_function( # tc class for anything that can be coerced into a LabeledTensor # pylint: disable=invalid-name -LabeledTensorLike = tc.Union(LabeledTensor, ops.Output, np.ndarray, Scalar) +LabeledTensorLike = tc.Union(LabeledTensor, ops.Tensor, np.ndarray, Scalar) # pylint: enable=invalid-name diff --git a/tensorflow/contrib/labeled_tensor/python/ops/ops.py b/tensorflow/contrib/labeled_tensor/python/ops/ops.py index a9ddbbd2cf..590590bf7b 100644 --- a/tensorflow/contrib/labeled_tensor/python/ops/ops.py +++ b/tensorflow/contrib/labeled_tensor/python/ops/ops.py @@ -36,7 +36,7 @@ from tensorflow.python.training import input # pylint: disable=redefined-builti @tc.returns(core.LabeledTensor) -@tc.accepts(core.LabeledTensor, ops.Output, core.Axis, +@tc.accepts(core.LabeledTensor, ops.Tensor, core.Axis, tc.Optional(string_types)) def _gather_1d_on_axis(labeled_tensor, indexer, axis, name=None): with ops.name_scope(name, 'lt_take', [labeled_tensor]) as scope: |