Disable constant folding for more tf.dbg tests, as they make assumptions on the

Yao Zhang · tensorflower-gardener · commit 809c12c7b291 · 2017-09-20T18:41:23.000-07:00
underlying graph structure.

PiperOrigin-RevId: 169484497
diff --git a/tensorflow/python/debug/cli/analyzer_cli_test.py b/tensorflow/python/debug/cli/analyzer_cli_test.py
@@ -47,7 +47,8 @@
 
 def no_rewrite_session_config():
   rewriter_config = rewriter_config_pb2.RewriterConfig(
-      disable_model_pruning=True)
+      disable_model_pruning=True,
+      constant_folding=rewriter_config_pb2.RewriterConfig.OFF)
   graph_options = config_pb2.GraphOptions(rewrite_options=rewriter_config)
   return config_pb2.ConfigProto(graph_options=graph_options)
 
diff --git a/tensorflow/python/debug/cli/profile_analyzer_cli_test.py b/tensorflow/python/debug/cli/profile_analyzer_cli_test.py
@@ -22,6 +22,7 @@
 
 from tensorflow.core.framework import step_stats_pb2
 from tensorflow.core.protobuf import config_pb2
+from tensorflow.core.protobuf import rewriter_config_pb2
 from tensorflow.python.client import session
 from tensorflow.python.debug.cli import debugger_cli_common
 from tensorflow.python.debug.cli import profile_analyzer_cli
@@ -35,6 +36,14 @@
 from tensorflow.python.util import tf_inspect
 
 
+def no_rewrite_session_config():
+  rewriter_config = rewriter_config_pb2.RewriterConfig(
+      disable_model_pruning=True,
+      constant_folding=rewriter_config_pb2.RewriterConfig.OFF)
+  graph_options = config_pb2.GraphOptions(rewrite_options=rewriter_config)
+  return config_pb2.ConfigProto(graph_options=graph_options)
+
+
 def _line_number_above():
   return tf_inspect.stack()[1][2] - 1
 
@@ -146,7 +155,7 @@ def testWithSession(self):
     options.trace_level = config_pb2.RunOptions.FULL_TRACE
     run_metadata = config_pb2.RunMetadata()
 
-    with session.Session() as sess:
+    with session.Session(config=no_rewrite_session_config()) as sess:
       a = constant_op.constant([1, 2, 3])
       b = constant_op.constant([2, 2, 1])
       result = math_ops.add(a, b)
