Removed node.run level profiling

Author: pintohutch

nipype/pipeline/plugins/multiproc.py

@@ -6,47 +6,40 @@
 http://stackoverflow.com/a/8963618/1183453
 """
 
+# Import packages
 from multiprocessing import Process, Pool, cpu_count, pool
 from traceback import format_exception
 import sys
 import numpy as np
 from copy import deepcopy
 from ..engine import MapNode
 from ...utils.misc import str2bool
-import datetime
 import psutil
 from ... import logging
 import semaphore_singleton
 from .base import (DistributedPluginBase, report_crash)
 
+# Init logger
+logger = logging.getLogger('workflow')
 
 # Run node
 def run_node(node, updatehash, runtime_profile=False):
     """docstring
     """
 
     # Import packages
-    try:
-        import memory_profiler
-        import datetime
-    except ImportError:
-        runtime_profile = False
+    import datetime
 
     # Init variables
     result = dict(result=None, traceback=None)
 
     # If we're profiling the run
     if runtime_profile:
         try:
-            # Init function tuple
-            proc = (node.run, (), {'updatehash' : updatehash})
             start = datetime.datetime.now()
-            mem_mb, retval = memory_profiler.memory_usage(proc=proc, retval=True,
-                                                          include_children=True,
-                                                          max_usage=True, interval=.9e-6)
+            retval = node.run(updatehash=updatehash)
             run_secs = (datetime.datetime.now() - start).total_seconds()
             result['result'] = retval
-            result['node_memory'] = mem_mb[0]/1024.0
             result['run_seconds'] = run_secs
             if hasattr(retval.runtime, 'get'):
                 result['cmd_memory'] = retval.runtime.get('cmd_memory')
@@ -83,11 +76,11 @@ class NonDaemonPool(pool.Pool):
     """
     Process = NonDaemonProcess
 
-logger = logging.getLogger('workflow')
 
 def release_lock(args):
     semaphore_singleton.semaphore.release()
 
+
 class ResourceMultiProcPlugin(DistributedPluginBase):
     """Execute workflow with multiprocessing, not sending more jobs at once
     than the system can support.