Automated g4 rollback of changelist 149812908

tensorflower-gardener · tensorflower-gardener · commit 2b3ed91c200f · 2017-11-13T19:39:40.000-08:00
PiperOrigin-RevId: 175626065
diff --git a/tensorflow/python/platform/app.py b/tensorflow/python/platform/app.py
@@ -25,10 +25,6 @@
 from tensorflow.python.util.all_util import remove_undocumented
 
 
-def _benchmark_tests_can_log_memory():
-  return True
-
-
 def _usage(shorthelp):
   """Writes __main__'s docstring to stdout with some help text.
 
diff --git a/tensorflow/python/platform/benchmark.py b/tensorflow/python/platform/benchmark.py
@@ -43,8 +43,6 @@
 # See also tensorflow/core/util/reporter.h TestReporter::kTestReporterEnv.
 TEST_REPORTER_TEST_ENV = "TEST_REPORT_FILE_PREFIX"
 
-_benchmark_tests_can_log_memory = app._benchmark_tests_can_log_memory  # pylint: disable=protected-access
-
 
 def _global_report_benchmark(
     name, iters=None, cpu_time=None, wall_time=None,
@@ -216,9 +214,8 @@ def run_op_benchmark(self,
         store the trace of iteration in the benchmark report.
         The trace will be stored as a string in Google Chrome trace format
         in the extras field "full_trace_chrome_format".
-      store_memory_usage: Boolean, whether to run an extra
-        untimed iteration, calculate memory usage, and store that in extras
-        fields.
+      store_memory_usage: Boolean, whether to run an extra untimed iteration,
+        calculate memory usage, and store that in extras fields.
       name: (optional) Override the BenchmarkEntry name with `name`.
         Otherwise it is inferred from the top-level method name.
       extras: (optional) Dict mapping string keys to additional benchmark info.
@@ -230,8 +227,6 @@ def run_op_benchmark(self,
       A `dict` containing the key-value pairs that were passed to
       `report_benchmark`.
     """
-    store_memory_usage &= _benchmark_tests_can_log_memory()
-
     for _ in range(burn_iters):
       sess.run(op_or_tensor, feed_dict=feed_dict)
 
