aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/ops/control_flow_ops.cc
diff options
context:
space:
mode:
authorGravatar Pete Warden <petewarden@google.com>2016-11-08 17:47:43 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-11-08 18:03:59 -0800
commit7ea2f7d2689d9686c93650bf5bcc4c8ba459377d (patch)
tree6abadcdfd651c5f0134ac0f37bbc7901fa18ee16 /tensorflow/core/ops/control_flow_ops.cc
parentcadb43c37a1806dd617233fab40330927289c89a (diff)
Refactor fold_constants to make reuse easier.
Change: 138588267
Diffstat (limited to 'tensorflow/core/ops/control_flow_ops.cc')
-rw-r--r--tensorflow/core/ops/control_flow_ops.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/core/ops/control_flow_ops.cc b/tensorflow/core/ops/control_flow_ops.cc
index 0a7c704b0a..645ae43553 100644
--- a/tensorflow/core/ops/control_flow_ops.cc
+++ b/tensorflow/core/ops/control_flow_ops.cc
@@ -122,7 +122,7 @@ Status MergeShape(InferenceContext* c) {
int32 rank = c->Rank(out);
for (int i = 1; i < c->num_inputs(); ++i) {
ShapeHandle input = c->input(i);
- if (c->Rank(input) != rank) {
+ if (!c->RankKnown(input) || c->Rank(input) != rank) {
out = c->UnknownShape();
break;
}