Disable shape inference for functions since it doesn't seem to work when

benoitsteiner · tensorflower-gardener · commit 17955b4ff561 · 2018-03-29T18:47:30.000-07:00
functions are instantiated inside a while loop.

PiperOrigin-RevId: 191019870
diff --git a/tensorflow/core/grappler/costs/graph_properties.cc b/tensorflow/core/grappler/costs/graph_properties.cc
@@ -926,7 +926,6 @@ Status GraphProperties::InferStatically(bool assume_valid_feeds) {
   ShapeRefiner shape_refiner(graph.versions(), graph.op_registry());
   shape_refiner.set_require_shape_inference_fns(false);
   shape_refiner.set_disable_constant_propagation(true);
-  shape_refiner.set_function_library_for_shape_inference(&function_library);
   ImportGraphDefOptions options;
   // Graph optimization happens at the late stage of graph execution,
   // when colocation constraints are already validated previously and
diff --git a/tensorflow/core/grappler/costs/graph_properties_test.cc b/tensorflow/core/grappler/costs/graph_properties_test.cc
@@ -742,6 +742,8 @@ TEST_F(GraphPropertiesTest, InferRestoreOpShape_WithTwoNodesShareSameOutput) {
   EXPECT_EQ("float: [128,256]", PropToString(prop));
 }
 
+#if 0
+// Disabled for now since this doesnt' seem to work when functions are instantiated inside while loops. It's also unclear whether it's correct when the same function is instantiated twice.
 TEST_F(GraphPropertiesTest, FunctionStaticShapeInference) {
   // Test graph produced in python using:
   /*
@@ -775,6 +777,7 @@ TEST_F(GraphPropertiesTest, FunctionStaticShapeInference) {
   EXPECT_TRUE(shape.IsFullyDefined());
   EXPECT_FALSE(shape.unknown_rank());
 }
+#endif
 
 TEST_F(GraphPropertiesTest, SymbolicShapes) {
   // Build a simple graph with placeholders of unknown dimensions. These

Original file line number	Diff line number	Diff line change
`@@ -742,6 +742,8 @@ TEST_F(GraphPropertiesTest, InferRestoreOpShape_WithTwoNodesShareSameOutput) {`
`742`	`742`	`EXPECT_EQ("float: [128,256]", PropToString(prop));`
`743`	`743`	`}`
`744`	`744`
	`745`	`+#if 0`
	`746`	`+// Disabled for now since this doesnt' seem to work when functions are instantiated inside while loops. It's also unclear whether it's correct when the same function is instantiated twice.`
`745`	`747`	`TEST_F(GraphPropertiesTest, FunctionStaticShapeInference) {`
`746`	`748`	`// Test graph produced in python using:`
`747`	`749`	`/*`
`@@ -775,6 +777,7 @@ TEST_F(GraphPropertiesTest, FunctionStaticShapeInference) {`
`775`	`777`	`EXPECT_TRUE(shape.IsFullyDefined());`
`776`	`778`	`EXPECT_FALSE(shape.unknown_rank());`
`777`	`779`	`}`
	`780`	`+#endif`
`778`	`781`
`779`	`782`	`TEST_F(GraphPropertiesTest, SymbolicShapes) {`
`780`	`783`	`// Build a simple graph with placeholders of unknown dimensions. These`