aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/profiler
diff options
context:
space:
mode:
authorGravatar Shanqing Cai <cais@google.com>2017-12-06 20:32:37 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-12-06 20:39:10 -0800
commit93dc52c707032ee4de6885edba064ee4e7308d40 (patch)
tree75230e1f4674475e374887cd6243f246d580f125 /tensorflow/python/profiler
parent072bc6a28a5f21c46c80c145d2bae3da475b32e7 (diff)
tfdbg: Add protocol for sending tracebacks and source code to debug server
PiperOrigin-RevId: 178192708
Diffstat (limited to 'tensorflow/python/profiler')
-rw-r--r--tensorflow/python/profiler/model_analyzer.py8
-rw-r--r--tensorflow/python/profiler/tfprof_logger.py6
2 files changed, 7 insertions, 7 deletions
diff --git a/tensorflow/python/profiler/model_analyzer.py b/tensorflow/python/profiler/model_analyzer.py
index 46a921c0a1..72422f11e9 100644
--- a/tensorflow/python/profiler/model_analyzer.py
+++ b/tensorflow/python/profiler/model_analyzer.py
@@ -162,7 +162,7 @@ class Profiler(object):
self._coverage = 0.0
self._graph = graph
# pylint: disable=protected-access
- op_log = tfprof_logger._merge_default_with_oplog(
+ op_log = tfprof_logger.merge_default_with_oplog(
self._graph, op_log=op_log)
# pylint: enable=protected-access
@@ -182,7 +182,7 @@ class Profiler(object):
run_meta: RunMetadata proto that contains statistics of a session run.
"""
# pylint: disable=protected-access
- op_log = tfprof_logger._merge_default_with_oplog(
+ op_log = tfprof_logger.merge_default_with_oplog(
self._graph, run_meta=run_meta)
# pylint: enable=protected-access
# TODO(xpan): P1: Better to find the current graph.
@@ -315,7 +315,7 @@ def profile(graph,
.trainable_variables_parameter())
# pylint: disable=protected-access
- op_log = tfprof_logger._merge_default_with_oplog(
+ op_log = tfprof_logger.merge_default_with_oplog(
graph, op_log, run_meta, add_trace=cmd == 'code')
# pylint: enable=protected-access
@@ -374,7 +374,7 @@ def advise(graph, run_meta=None, options=_DEFAULT_ADVISE_OPTIONS):
options = ALL_ADVICE.copy()
# pylint: disable=protected-access
- op_log = tfprof_logger._merge_default_with_oplog(
+ op_log = tfprof_logger.merge_default_with_oplog(
graph, None, run_meta, add_trace=True)
# pylint: enable=protected-access
diff --git a/tensorflow/python/profiler/tfprof_logger.py b/tensorflow/python/profiler/tfprof_logger.py
index 838064a1f0..15c273794d 100644
--- a/tensorflow/python/profiler/tfprof_logger.py
+++ b/tensorflow/python/profiler/tfprof_logger.py
@@ -139,8 +139,8 @@ def _get_logged_ops(graph, run_meta=None, add_trace=True,
return logged_ops, string_to_id
-def _merge_default_with_oplog(graph, op_log=None, run_meta=None,
- add_trace=True, add_trainable_var=True):
+def merge_default_with_oplog(graph, op_log=None, run_meta=None,
+ add_trace=True, add_trainable_var=True):
"""Merge the tfprof default extra info with caller's op_log.
Args:
@@ -199,7 +199,7 @@ def write_op_log(graph, log_dir, op_log=None, run_meta=None, add_trace=True):
add_trace: Whether to add python code trace information.
Used to support "code" view.
"""
- op_log = _merge_default_with_oplog(graph, op_log, run_meta, add_trace)
+ op_log = merge_default_with_oplog(graph, op_log, run_meta, add_trace)
with gfile.Open(os.path.join(log_dir, 'tfprof_log'), 'w') as log:
log.write(op_log.SerializeToString())