make valgrind_toggle and valgrind_supported_platform private (pytorch…

…#46718)
UNSWComputing · Oct 23, 2020 · e85d494 · e85d494
1 parent a6e96b1
commit e85d494
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/torch/_C/__init__.pyi.in b/torch/_C/__init__.pyi.in
@@ -381,8 +381,8 @@ def _log_api_usage_once(str) -> None: ...  # LogAPIUsageOnceFromPython
 def _demangle(str) -> str: ...  # c10::demangle
 
 # Defined in `valgrind.h` and `callgrind.h` respecitively.
-def valgrind_supported_platform() -> _bool: ...  # NVALGRIND
-def valgrind_toggle() -> None: ...  # CALLGRIND_TOGGLE_COLLECT
+def _valgrind_supported_platform() -> _bool: ...  # NVALGRIND
+def _valgrind_toggle() -> None: ...  # CALLGRIND_TOGGLE_COLLECT
 
 has_openmp: _bool
 has_mkl: _bool

diff --git a/torch/csrc/Module.cpp b/torch/csrc/Module.cpp
@@ -828,7 +828,7 @@ Call this whenever a new thread is created in order to propagate values from
   ASSERT_TRUE(set_module_attr("has_lapack", at::hasLAPACK() ? Py_True : Py_False));
 
   py_module.def(
-    "valgrind_supported_platform", [](){
+    "_valgrind_supported_platform", [](){
       #if defined(NVALGRIND)
       return false;
       #else
@@ -838,7 +838,7 @@ Call this whenever a new thread is created in order to propagate values from
   );
 
   py_module.def(
-    "valgrind_toggle", [](){
+    "_valgrind_toggle", [](){
       #if defined(NVALGRIND)
       TORCH_CHECK(false, "Valgrind is not supported.");
       #else

diff --git a/torch/overrides.py b/torch/overrides.py
@@ -156,8 +156,6 @@ def get_ignored_functions() -> Set[Callable]:
         torch.is_deterministic,
         torch.set_deterministic,
         torch.unify_type_list,
-        torch.valgrind_supported_platform,
-        torch.valgrind_toggle,
         Tensor.__delitem__,
         Tensor.__dir__,
         Tensor.__getattribute__,

diff --git a/torch/utils/benchmark/utils/valgrind_wrapper/timer_interface.py b/torch/utils/benchmark/utils/valgrind_wrapper/timer_interface.py
@@ -176,7 +176,7 @@ def _diff(first: Tuple[FunctionCount, ...], second: Tuple[FunctionCount, ...]) -
 class _ValgrindWrapper(object):
     def __init__(self) -> None:
         self._commands_available: Dict[str, bool] = {}
-        if torch._C.valgrind_supported_platform():
+        if torch._C._valgrind_supported_platform():
             # Only bother checking on supported platforms.
             for cmd in ("valgrind", "callgrind_control", "callgrind_annotate"):
                 self._commands_available[cmd] = not subprocess.run(
@@ -193,7 +193,7 @@ def __init__(self) -> None:
         self._baseline_cache: Dict[Tuple[int, int], Tuple[Tuple[FunctionCount, ...], Tuple[FunctionCount, ...]]] = {}
 
     def _validate(self) -> None:
-        if not torch._C.valgrind_supported_platform():
+        if not torch._C._valgrind_supported_platform():
             raise OSError("Valgrind is not supported on this platform.")
 
         missing_cmds = [cmd for cmd, available in self._commands_available.items() if not available]
@@ -444,13 +444,13 @@ def check_result(completed_process):
             # =============================================================================
             # == User code block ==========================================================
             # =============================================================================
-            torch._C.valgrind_toggle()
+            torch._C._valgrind_toggle()
             {blocked_stmt}
 
             # Sleep is to allow the interpreter to catch up before we stop collecting in
             # order to reduce jitter.
             time.sleep(0.01)
-            torch._C.valgrind_toggle()
+            torch._C._valgrind_toggle()
         """).strip().format(
             indented_stmt=textwrap.indent(stmt, " " * 4),
             blocked_stmt=blocked_stmt,