diff options
author | Jiri Simsa <jsimsa@google.com> | 2018-04-12 19:13:18 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-04-12 19:15:34 -0700 |
commit | 4f615adc1d7875f9fbe592619dc6b0f31cc7fd9e (patch) | |
tree | 0e01b5fc806240f5aa080dfb97dd07da40fdde10 /tensorflow/contrib/proto | |
parent | 5a6d5a1b3982e59548340422f831ada6f5d5e0be (diff) |
Automated g4 rollback of changelist 192691078
PiperOrigin-RevId: 192708480
Diffstat (limited to 'tensorflow/contrib/proto')
3 files changed, 11 insertions, 12 deletions
diff --git a/tensorflow/contrib/proto/python/kernel_tests/decode_proto_fail_test.py b/tensorflow/contrib/proto/python/kernel_tests/decode_proto_fail_test.py index f8969b0bd5..f019833905 100644 --- a/tensorflow/contrib/proto/python/kernel_tests/decode_proto_fail_test.py +++ b/tensorflow/contrib/proto/python/kernel_tests/decode_proto_fail_test.py @@ -21,7 +21,7 @@ from __future__ import print_function import numpy as np -from tensorflow.contrib.proto import decode_proto +from tensorflow.contrib import proto from tensorflow.contrib.proto.python.kernel_tests import test_case from tensorflow.python.framework import dtypes from tensorflow.python.framework import errors @@ -46,7 +46,7 @@ class DecodeProtoFailTest(test_case.ProtoOpTestCase): field_types = [dtypes.int32] with self.test_session() as sess: - ctensor, vtensor = decode_proto( + ctensor, vtensor = proto.decode_proto( batch, message_type=msg_type, field_names=field_names, diff --git a/tensorflow/contrib/proto/python/kernel_tests/decode_proto_op_test.py b/tensorflow/contrib/proto/python/kernel_tests/decode_proto_op_test.py index cd5121cdba..30ceac5f5f 100644 --- a/tensorflow/contrib/proto/python/kernel_tests/decode_proto_op_test.py +++ b/tensorflow/contrib/proto/python/kernel_tests/decode_proto_op_test.py @@ -27,7 +27,7 @@ import numpy as np from google.protobuf import text_format -from tensorflow.contrib.proto import decode_proto +from tensorflow.contrib import proto from tensorflow.contrib.proto.python.kernel_tests import test_case from tensorflow.contrib.proto.python.kernel_tests import test_example_pb2 from tensorflow.python.framework import dtypes @@ -175,7 +175,7 @@ class DecodeProtoOpTest(test_case.ProtoOpTestCase): output_types = [f.dtype for f in fields] with self.test_session() as sess: - sizes, vtensor = decode_proto( + sizes, vtensor = proto.decode_proto( batch, message_type=message_type, field_names=field_names, diff --git a/tensorflow/contrib/proto/python/kernel_tests/encode_proto_op_test.py b/tensorflow/contrib/proto/python/kernel_tests/encode_proto_op_test.py index a289ff290a..2a24c3b8ce 100644 --- a/tensorflow/contrib/proto/python/kernel_tests/encode_proto_op_test.py +++ b/tensorflow/contrib/proto/python/kernel_tests/encode_proto_op_test.py @@ -30,8 +30,7 @@ import numpy as np from google.protobuf import text_format -from tensorflow.contrib.proto import decode_proto -from tensorflow.contrib.proto import encode_proto +from tensorflow.contrib import proto from tensorflow.contrib.proto.python.kernel_tests import test_case from tensorflow.contrib.proto.python.kernel_tests import test_example_pb2 from tensorflow.python.framework import dtypes @@ -51,7 +50,7 @@ class EncodeProtoOpTest(test_case.ProtoOpTestCase): # Invalid field name with self.test_session(): with self.assertRaisesOpError('Unknown field: non_existent_field'): - encode_proto( + proto.encode_proto( sizes=[[1]], values=[np.array([[0.0]], dtype=np.int32)], message_type='tensorflow.contrib.proto.RepeatedPrimitiveValue', @@ -61,7 +60,7 @@ class EncodeProtoOpTest(test_case.ProtoOpTestCase): with self.test_session(): with self.assertRaisesOpError( 'Incompatible type for field double_value.'): - encode_proto( + proto.encode_proto( sizes=[[1]], values=[np.array([[0.0]], dtype=np.int32)], message_type='tensorflow.contrib.proto.RepeatedPrimitiveValue', @@ -73,7 +72,7 @@ class EncodeProtoOpTest(test_case.ProtoOpTestCase): r'sizes should be batch_size \+ \[len\(field_names\)\]'): sizes = array_ops.placeholder(dtypes.int32) values = array_ops.placeholder(dtypes.float64) - encode_proto( + proto.encode_proto( sizes=sizes, values=[values], message_type='tensorflow.contrib.proto.RepeatedPrimitiveValue', @@ -89,7 +88,7 @@ class EncodeProtoOpTest(test_case.ProtoOpTestCase): sizes = array_ops.placeholder(dtypes.int32) values1 = array_ops.placeholder(dtypes.float64) values2 = array_ops.placeholder(dtypes.int32) - (encode_proto( + (proto.encode_proto( sizes=[[1, 1]], values=[values1, values2], message_type='tensorflow.contrib.proto.RepeatedPrimitiveValue', @@ -104,13 +103,13 @@ class EncodeProtoOpTest(test_case.ProtoOpTestCase): out_types = [f.dtype for f in fields] with self.test_session() as sess: - sizes, field_tensors = decode_proto( + sizes, field_tensors = proto.decode_proto( in_bufs, message_type=message_type, field_names=field_names, output_types=out_types) - out_tensors = encode_proto( + out_tensors = proto.encode_proto( sizes, field_tensors, message_type=message_type, |