commit be7b286d40bc68cb0b56f702186cc4837d508058
author Mihai Maruseac <mihaimaruseac@google.com> Mon Nov 15 13:55:14 2021 -0800
committer TensorFlower Gardener <gardener@tensorflow.org> Mon Nov 15 14:06:41 2021 -0800
tree 6317ecf7a8ded860328db05d6b84d89d41556808
parent 6381a7b127bd276a3817a93e5423b15a06c33419

Fix `CHECK`-failure caused by constant folding code.

We're losing a `const` qualifier here, but unless we get to use more `StatusOr` objects, this is the best alternative.

PiperOrigin-RevId: 410072241
Change-Id: I69535c91490f0d23facb9587d2ff59db0782cda6

tensorflow/core/grappler/optimizers/constant_folding.cc

diff --git a/tensorflow/core/grappler/optimizers/constant_folding.cc b/tensorflow/core/grappler/optimizers/constant_folding.cc
index a05823f..77a3f22 100644
--- a/tensorflow/core/grappler/optimizers/constant_folding.cc
+++ b/tensorflow/core/grappler/optimizers/constant_folding.cc
@@ -1017,7 +1017,12 @@
       }
     }
     for (const auto& output_prop : output_props) {
-      const PartialTensorShape output_shape(output_prop.shape());
+      PartialTensorShape output_shape;
+      if (!PartialTensorShape::BuildPartialTensorShape(output_prop.shape(),
+                                                       &output_shape)
+               .ok()) {
+        return false;
+      }
       if (output_shape.IsFullyDefined()) {
         const int64_t num_bytes =
             output_shape.num_elements() * DataTypeSize(output_prop.dtype());