aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nupur Garg <nupurgarg@google.com>2018-06-04 12:08:15 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-06-04 12:11:22 -0700
commitd16877ce0372df0c1ff5b8046fbe8985cfb796f9 (patch)
tree8f7aa8b070093900a0479f0fc4736a673154f9fe
parent836fc096c77a3b1170b91242e30b6075e7805cec (diff)
Fix Python API.
PiperOrigin-RevId: 199171845
-rw-r--r--tensorflow/contrib/lite/python/convert_saved_model.py4
-rw-r--r--tensorflow/contrib/lite/python/convert_saved_model_test.py9
2 files changed, 9 insertions, 4 deletions
diff --git a/tensorflow/contrib/lite/python/convert_saved_model.py b/tensorflow/contrib/lite/python/convert_saved_model.py
index b952a72aab..5dad49f1ed 100644
--- a/tensorflow/contrib/lite/python/convert_saved_model.py
+++ b/tensorflow/contrib/lite/python/convert_saved_model.py
@@ -216,9 +216,9 @@ def set_tensor_shapes(tensors, shapes):
"""
if shapes:
for tensor in tensors:
- shape = shapes.get(tensor.name)
+ shape = shapes.get(tensor_name(tensor))
if shape is not None:
- tensor.set_shape(shapes[tensor.name])
+ tensor.set_shape(shape)
def freeze_saved_model(saved_model_dir, input_arrays, input_shapes,
diff --git a/tensorflow/contrib/lite/python/convert_saved_model_test.py b/tensorflow/contrib/lite/python/convert_saved_model_test.py
index 80e5dc6e46..1e570d2c89 100644
--- a/tensorflow/contrib/lite/python/convert_saved_model_test.py
+++ b/tensorflow/contrib/lite/python/convert_saved_model_test.py
@@ -73,10 +73,15 @@ class TensorFunctionsTest(test_util.TensorFlowTestCase):
tensor = array_ops.placeholder(shape=[None, 3, 5], dtype=dtypes.float32)
self.assertEqual([None, 3, 5], tensor.shape.as_list())
- convert_saved_model.set_tensor_shapes([tensor],
- {"Placeholder:0": [5, 3, 5]})
+ convert_saved_model.set_tensor_shapes([tensor], {"Placeholder": [5, 3, 5]})
self.assertEqual([5, 3, 5], tensor.shape.as_list())
+ def testSetTensorShapeNoneValid(self):
+ tensor = array_ops.placeholder(dtype=dtypes.float32)
+
+ convert_saved_model.set_tensor_shapes([tensor], {"Placeholder": [1, 3, 5]})
+ self.assertEqual([1, 3, 5], tensor.shape.as_list())
+
def testSetTensorShapeInvalid(self):
tensor = array_ops.placeholder(shape=[None, 3, 5], dtype=dtypes.float32)
self.assertEqual([None, 3, 5], tensor.shape.as_list())