Cleaned up some code and removed recursion from get_num_threads

Author: pintohutch

nipype/interfaces/base.py

@@ -1211,15 +1211,17 @@ def _get_num_threads(proc):
 
     # Import packages
     import psutil
+    import logging as lg
 
     # Init variables
     num_threads = proc.num_threads()
     try:
+        num_children = len(proc.children())
         for child in proc.children():
-            num_threads = max(num_threads, child.num_threads(),
-                              len(child.children()), _get_num_threads(child))
+            num_threads = max(num_threads, num_children,
+                              child.num_threads(), len(child.children()))
     except psutil.NoSuchProcess:
-        dummy = 1
+        pass
 
     return num_threads
 

nipype/interfaces/utility.py

@@ -449,14 +449,6 @@ def _run_interface(self, runtime):
             if isdefined(value):
                 args[name] = value
 
-        # Record memory of function_handle
-        #try:
-        #    import memory_profiler
-        #    proc = (function_handle, (), args)
-        #    mem_mb, out = memory_profiler.memory_usage(proc=proc, retval=True, include_children=True, max_usage=True)
-        #    setattr(runtime, 'cmd_memory', mem_mb[0]/1024.0)
-        ## If no memory_profiler package, run without recording memory
-        #except:
         out = function_handle(**args)
 
         if len(self._output_names) == 1:

nipype/pipeline/plugins/multiproc.py

@@ -44,10 +44,10 @@ def run_node(node, updatehash, runtime_profile=False):
             mem_mb, retval = memory_profiler.memory_usage(proc=proc, retval=True,
                                                           include_children=True,
                                                           max_usage=True)
-            runtime = (datetime.datetime.now() - start).total_seconds()
+            run_secs = (datetime.datetime.now() - start).total_seconds()
             result['result'] = retval
             result['node_memory'] = mem_mb[0]/1024.0
-            result['run_seconds'] = runtime
+            result['run_seconds'] = run_secs
             result['cmd_memory'] = retval.runtime.get('cmd_memory')
             result['cmd_threads'] = retval.runtime.get('cmd_threads')
         except:
@@ -118,7 +118,7 @@ def __init__(self, plugin_args=None):
         self.plugin_args = plugin_args
         self.processors = cpu_count()
         memory = psutil.virtual_memory()
-        self.memory = memory.total / (1024*1024*1024)
+        self.memory = float(memory.total) / (1024.0**3)
         if self.plugin_args:
             if 'non_daemon' in self.plugin_args:
                 non_daemon = plugin_args['non_daemon']