Removes need for expected_shape in Variable() constructor.

Change: 141353742

2 files changed, 134 insertions, 140 deletions

diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
index c1c4f0921c..24f39ef03d 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/model_analyzer_test.py
@@ -75,7 +75,7 @@ class PrintModelAnalysisTest(tf.test.TestCase):
       with tf.gfile.Open(opts['dump_to_file'], 'r') as f:
         # pylint: disable=line-too-long
         self.assertEqual(
-            '_TFProfRoot (0/450 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Variable|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Variable|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
+            '_TFProfRoot (0/450 params, 0/10.44k flops, 0B/5.28KB, _kTFScopeParent)\n  Conv2D (0/0 params, 5.83k/5.83k flops, 432B/432B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  Conv2D_1 (0/0 params, 4.61k/4.61k flops, 384B/384B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Conv2D)\n  DW (3x3x3x6, 162/162 params, 0/0 flops, 648B/1.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Variable|_trainable_variables)\n    DW/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW/read (0/0 params, 0/0 flops, 648B/648B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  DW2 (2x2x6x12, 288/288 params, 0/0 flops, 1.15KB/2.30KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Variable|_trainable_variables)\n    DW2/Assign (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|Assign)\n    DW2/Initializer (0/0 params, 0/0 flops, 0B/0B, _kTFScopeParent)\n      DW2/Initializer/random_normal (0/0 params, 0/0 flops, 0B/0B, Add)\n        DW2/Initializer/random_normal/RandomStandardNormal (0/0 params, 0/0 flops, 0B/0B, RandomStandardNormal)\n        DW2/Initializer/random_normal/mean (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/mul (0/0 params, 0/0 flops, 0B/0B, Mul)\n        DW2/Initializer/random_normal/shape (0/0 params, 0/0 flops, 0B/0B, Const)\n        DW2/Initializer/random_normal/stddev (0/0 params, 0/0 flops, 0B/0B, Const)\n    DW2/read (0/0 params, 0/0 flops, 1.15KB/1.15KB, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Identity)\n  init (0/0 params, 0/0 flops, 0B/0B, /device:CPU:0, /device:CPU:0|NoOp)\n  zeros (0/0 params, 0/0 flops, 864B/864B, /job:localhost/replica:0/task:0/cpu:0, /job:localhost/replica:0/task:0/cpu:0|Const)\n',
             f.read().decode('utf-8'))
         # pylint: enable=line-too-long
 
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
index 0354d0f631..46bdf2dcb2 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/print_model_analysis_test.py
@@ -92,145 +92,139 @@ class PrintModelAnalysisTest(tf.test.TestCase):
 
       expected_pb = tfprof_output_pb2.TFProfNode()
       text_format.Merge(r"""name: "_TFProfRoot"
-          exec_micros: 0
-          requested_bytes: 0
-          total_exec_micros: 0
-          total_requested_bytes: 0
-          total_parameters: 648
-          children {
-            name: "Conv2D"
-            exec_micros: 0
-            requested_bytes: 0
-            total_exec_micros: 0
-            total_requested_bytes: 0
-            total_parameters: 0
-            device: "/device:CPU:0"
-            float_ops: 0
-            total_float_ops: 0
-          }
-          children {
-            name: "DW"
-            exec_micros: 0
-            requested_bytes: 0
-            parameters: 648
-            total_exec_micros: 0
-            total_requested_bytes: 0
-            total_parameters: 648
-            device: "/device:CPU:0"
-            children {
-              name: "DW/Assign"
-              exec_micros: 0
-              requested_bytes: 0
-              total_exec_micros: 0
-              total_requested_bytes: 0
-              total_parameters: 0
-              device: "/device:CPU:0"
-              float_ops: 0
-              total_float_ops: 0
-            }
-            children {
-              name: "DW/Initializer"
-              exec_micros: 0
-              requested_bytes: 0
-              total_exec_micros: 0
-              total_requested_bytes: 0
-              total_parameters: 0
-              children {
-                name: "DW/Initializer/random_normal"
-                exec_micros: 0
-                requested_bytes: 0
-                total_exec_micros: 0
-                total_requested_bytes: 0
-                total_parameters: 0
-                device: "/device:CPU:0"
-                children {
-                  name: "DW/Initializer/random_normal/RandomStandardNormal"
-                  exec_micros: 0
-                  requested_bytes: 0
-                  total_exec_micros: 0
-                  total_requested_bytes: 0
-                  total_parameters: 0
-                  device: "/device:CPU:0"
-                  float_ops: 0
-                  total_float_ops: 0
-                }
-                children {
-                  name: "DW/Initializer/random_normal/mean"
-                  exec_micros: 0
-                  requested_bytes: 0
-                  total_exec_micros: 0
-                  total_requested_bytes: 0
-                  total_parameters: 0
-                  device: "/device:CPU:0"
-                  float_ops: 0
-                  total_float_ops: 0
-                }
-                children {
-                  name: "DW/Initializer/random_normal/mul"
-                  exec_micros: 0
-                  requested_bytes: 0
-                  total_exec_micros: 0
-                  total_requested_bytes: 0
-                  total_parameters: 0
-                  device: "/device:CPU:0"
-                  float_ops: 0
-                  total_float_ops: 0
-                }
-                children {
-                  name: "DW/Initializer/random_normal/shape"
-                  exec_micros: 0
-                  requested_bytes: 0
-                  total_exec_micros: 0
-                  total_requested_bytes: 0
-                  total_parameters: 0
-                  device: "/device:CPU:0"
-                  float_ops: 0
-                  total_float_ops: 0
-                }
-                children {
-                  name: "DW/Initializer/random_normal/stddev"
-                  exec_micros: 0
-                  requested_bytes: 0
-                  total_exec_micros: 0
-                  total_requested_bytes: 0
-                  total_parameters: 0
-                  device: "/device:CPU:0"
-                  float_ops: 0
-                  total_float_ops: 0
-                }
-                float_ops: 0
-                total_float_ops: 0
-              }
-              float_ops: 0
-              total_float_ops: 0
-            }
-            children {
-              name: "DW/read"
-              exec_micros: 0
-              requested_bytes: 0
-              total_exec_micros: 0
-              total_requested_bytes: 0
-              total_parameters: 0
-              device: "/device:CPU:0"
-              float_ops: 0
-              total_float_ops: 0
-            }
-            float_ops: 0
-            total_float_ops: 0
-          }
-          children {
-            name: "zeros"
-            exec_micros: 0
-            requested_bytes: 0
-            total_exec_micros: 0
-            total_requested_bytes: 0
-            total_parameters: 0
-            device: "/device:CPU:0"
-            float_ops: 0
-            total_float_ops: 0
-          }
-          float_ops: 0
-          total_float_ops: 0""", expected_pb)
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 648
+      children {
+      name: "Conv2D"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      device: "/device:CPU:0"
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW"
+      exec_micros: 0
+      requested_bytes: 0
+      parameters: 648
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 648
+      device: "/device:CPU:0"
+      children {
+      name: "DW/Assign"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      device: "/device:CPU:0"
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/Initializer"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      children {
+      name: "DW/Initializer/random_normal"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      children {
+      name: "DW/Initializer/random_normal/RandomStandardNormal"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/Initializer/random_normal/mean"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/Initializer/random_normal/mul"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/Initializer/random_normal/shape"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/Initializer/random_normal/stddev"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      float_ops: 0
+      total_float_ops: 0
+      }
+      float_ops: 0
+      total_float_ops: 0
+      }
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "DW/read"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      device: "/device:CPU:0"
+      float_ops: 0
+      total_float_ops: 0
+      }
+      float_ops: 0
+      total_float_ops: 0
+      }
+      children {
+      name: "zeros"
+      exec_micros: 0
+      requested_bytes: 0
+      total_exec_micros: 0
+      total_requested_bytes: 0
+      total_parameters: 0
+      device: "/device:CPU:0"
+      float_ops: 0
+      total_float_ops: 0
+      }
+      float_ops: 0
+      total_float_ops: 0""", expected_pb)
       self.assertEqual(expected_pb, tfprof_pb)