fix: do not use mock

Author: oesteban

nipype/interfaces/base/support.py

@@ -19,7 +19,7 @@
 from ... import logging, config
 from ...utils.misc import is_container, rgetcwd
 from ...utils.filemanip import md5, hash_infile
-from ...utils.profiler import ResourceMonitor, ResourceMonitorMock
+from ...utils.profiler import ResourceMonitor
 
 iflogger = logging.getLogger("nipype.interface")
 
@@ -44,13 +44,13 @@ def __call__(self, interface, cwd=None, redirect_x=False):
         if cwd is None:
             cwd = _syscwd
 
-        _proc_pid = os.getpid()
-        _ResourceMonitor = ResourceMonitor if self._resmon else ResourceMonitorMock
-        self._resmon = _ResourceMonitor(
-            _proc_pid,
-            cwd=cwd,
-            freq=float(config.get("execution", "resource_monitor_frequency", 1)),
-        )
+        if self._resmon:
+            _proc_pid = os.getpid()
+            self._resmon = ResourceMonitor(
+                _proc_pid,
+                cwd=cwd,
+                freq=float(config.get("execution", "resource_monitor_frequency", 1)),
+            )
 
         self._runtime = Bunch(
             cwd=str(cwd),
@@ -62,7 +62,7 @@ def __call__(self, interface, cwd=None, redirect_x=False):
             platform=platform.platform(),
             prevcwd=str(_syscwd),
             redirect_x=redirect_x,
-            resmon=self._resmon.fname or "off",
+            resmon=getattr(self._resmon, "fname", "off"),
             returncode=None,
             startTime=None,
             version=interface.version,
@@ -75,7 +75,8 @@ def __enter__(self):
             self._runtime.environ["DISPLAY"] = config.get_display()
 
         self._runtime.startTime = dt.isoformat(dt.utcnow())
-        self._resmon.start()
+        if self._resmon:
+            self._resmon.start()
         # TODO: Perhaps clean-up path and ensure it exists?
         os.chdir(self._runtime.cwd)
         return self._runtime
@@ -88,8 +89,9 @@ def __exit__(self, exc_type, exc_value, exc_tb):
             timediff.days * 86400 + timediff.seconds + timediff.microseconds / 1e6
         )
         # Collect monitored data
-        for k, v in self._resmon.stop().items():
-            setattr(self._runtime, k, v)
+        if self._resmon:
+            for k, v in self._resmon.stop().items():
+                setattr(self._runtime, k, v)
 
         os.chdir(self._runtime.prevcwd)
 

nipype/utils/profiler.py

@@ -24,24 +24,6 @@
 _MB = 1024.0**2
 
 
-class ResourceMonitorMock:
-    """A mock class to use when the monitor is disabled."""
-
-    @property
-    def fname(self):
-        """Get/set the internal filename"""
-        return None
-
-    def __init__(self, pid, freq=5, fname=None, cwd=None):
-        pass
-
-    def start(self):
-        pass
-
-    def stop(self):
-        return {}
-
-
 class ResourceMonitor(threading.Thread):
     """
     A ``Thread`` to monitor a specific PID with a certain frequence