diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-09-08 10:25:00 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-09-08 11:32:57 -0700 |
| commit | 9205b55c6bbef400fa1cdb0140a99576608f5b3f (patch) | |
| tree | d1511fd7822c7c5611c2d6d3ab0dd3f4c8ff8207 /tensorflow/python/framework/common_shapes.py | |
| parent | 71e3186fd3b3b62aeb43a697432565a9434fa9f5 (diff) | |
Switch several ops in array_ops.py to use C++ shape functions.
Change C++ shape function for ExpandDims to be more permissive - it now allows
'dim' to be any tensor with 1 element, although that is not currently
converted to use C++ because of a separate issue to fix first (later change).
Change C++ shape functions for SpaceToBatch and BatchToSpace to output rank-4
unknown shapes.
Change: 132578764
Diffstat (limited to 'tensorflow/python/framework/common_shapes.py')
| -rw-r--r-- | tensorflow/python/framework/common_shapes.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/python/framework/common_shapes.py b/tensorflow/python/framework/common_shapes.py index ba366cbc13..8c5251bdf1 100644 --- a/tensorflow/python/framework/common_shapes.py +++ b/tensorflow/python/framework/common_shapes.py @@ -646,7 +646,7 @@ def call_cpp_shape_fn(op, input_tensors_needed=None, if str(result) != str(python_result): raise ValueError( ("Python vs CPP shape mismatch. " - "python: %s vs CPP: %s on node %s " + "CPP: %s vs python: %s on node %s " "with input shapes %s") % ( str(result), str(python_result), str(op.node_def), ",".join([str(i.get_shape()) for i in op.inputs]))) |