experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move 'enabled' from _pywrap_traceme to trace

Browse Source 
PiperOrigin-RevId: 316134360
Change-Id: I256ea280e7ddcd2df3853a943082ff63a52dfffa
This commit is contained in:
Jose Baiocchi 2020-06-12 10:52:27 -07:00 committed by TensorFlower Gardener
parent 795362accd
commit 1e2a941351
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tensorflow/python/framework/constant_op.py
View File

@ -32,8 +32,7 @@ from tensorflow.python.framework import op_callbacks
from tensorflow.python.framework import ops from tensorflow.python.framework import ops
from tensorflow.python.framework import tensor_shape from tensorflow.python.framework import tensor_shape
from tensorflow.python.framework import tensor_util from tensorflow.python.framework import tensor_util
from tensorflow.python.profiler import traceme from tensorflow.python.profiler import trace
from tensorflow.python.profiler.internal import _pywrap_traceme
from tensorflow.python.util.tf_export import tf_export from tensorflow.python.util.tf_export import tf_export
@ -270,8 +269,8 @@ def _constant_impl(
"""Implementation of constant.""" """Implementation of constant."""
ctx = context.context() ctx = context.context()
if ctx.executing_eagerly(): if ctx.executing_eagerly():
if _pywrap_traceme.enabled: if trace.enabled:
with traceme.TraceMe("tf.constant"): with trace.Trace("tf.constant"):
return _constant_eager_impl(ctx, value, dtype, shape, verify_shape) return _constant_eager_impl(ctx, value, dtype, shape, verify_shape)
return _constant_eager_impl(ctx, value, dtype, shape, verify_shape) return _constant_eager_impl(ctx, value, dtype, shape, verify_shape)

5
tensorflow/python/profiler/BUILD
View File

@ -224,7 +224,10 @@ py_library(
name = "trace", name = "trace",
srcs = ["trace.py"], srcs = ["trace.py"],
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
visibility = ["//tensorflow:internal"], visibility = [
"//perftools/accelerators/xprof/xprofilez/integration_tests:__pkg__",
"//tensorflow:internal",
],
deps = [ deps = [
"//tensorflow/python:tf_export", "//tensorflow/python:tf_export",
"//tensorflow/python/profiler/internal:_pywrap_traceme", "//tensorflow/python/profiler/internal:_pywrap_traceme",

4
tensorflow/python/profiler/internal/python_hooks.cc
View File

@ -199,9 +199,9 @@ void PythonHooks::ClearProfilerInAllThreads() {
void PythonHooks::EnableTraceMe(bool enable) { void PythonHooks::EnableTraceMe(bool enable) {
const char* kModuleName = const char* kModuleName =
"tensorflow.python.profiler.internal._pywrap_traceme"; "tensorflow.python.profiler.trace";
auto trace_module = py::module::import(kModuleName); auto trace_module = py::module::import(kModuleName);
trace_module.attr("enabled") = enable; trace_module.attr("enabled") = py::bool_(enable);
} }
} // namespace profiler } // namespace profiler

6
tensorflow/python/profiler/internal/traceme_wrapper.cc
View File

@ -23,10 +23,8 @@ namespace py = ::pybind11;
using ::tensorflow::profiler::TraceMeWrapper; using ::tensorflow::profiler::TraceMeWrapper;
PYBIND11_MODULE(_pywrap_traceme, m) { PYBIND11_MODULE(_pywrap_traceme, m) {
// This variable will be modified by PythonHooks::Start/Stop(). such
// arrangement will reduce the number of calls through pybind11.
m.attr("enabled") = py::bool_(false);
py::class_<TraceMeWrapper>(m, "TraceMe", py::module_local()) py::class_<TraceMeWrapper>(m, "TraceMe", py::module_local())
.def(py::init<const py::str&, const py::kwargs&>()) .def(py::init<const py::str&, const py::kwargs&>())
.def("SetMetadata", &TraceMeWrapper::SetMetadata); .def("SetMetadata", &TraceMeWrapper::SetMetadata)
.def("Stop", &TraceMeWrapper::Stop);
}; };

10
tensorflow/python/profiler/trace.py
View File

@ -21,6 +21,10 @@ from __future__ import print_function
from tensorflow.python.profiler.internal import _pywrap_traceme from tensorflow.python.profiler.internal import _pywrap_traceme
from tensorflow.python.util.tf_export import tf_export from tensorflow.python.util.tf_export import tf_export
# This variable is modified by PythonHooks::Start/Stop() in C++. Such
# arrangement will reduce the number of calls through pybind11.
enabled = False
@tf_export('profiler.experimental.Trace', v1=[]) @tf_export('profiler.experimental.Trace', v1=[])
class Trace(object): class Trace(object):
@ -72,7 +76,7 @@ class Trace(object):
The example above uses the keyword argument "step_num" to specify the The example above uses the keyword argument "step_num" to specify the
training step being traced. training step being traced.
""" """
if _pywrap_traceme.enabled: if enabled:
# Creating _pywrap_traceme.TraceMe starts the clock. # Creating _pywrap_traceme.TraceMe starts the clock.
self._traceme = _pywrap_traceme.TraceMe(name, **kwargs) self._traceme = _pywrap_traceme.TraceMe(name, **kwargs)
else: else:
@ -117,5 +121,5 @@ class Trace(object):
self._traceme.SetMetadata(**kwargs) self._traceme.SetMetadata(**kwargs)
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
# Deallocating _pywrap_traceme.TraceMe stops the clock. if self._traceme:
self._traceme = None self._traceme.Stop()