Made when result is None that the end stats are N/A

Author: pintohutch

nipype/pipeline/plugins/callback_log.py

@@ -3,13 +3,13 @@
 
 def log_nodes_cb(node, status, result=None):
     logger = logging.getLogger('callback')
-    try:
+    if result is None:
+        node_mem = cmd_mem = run_seconds = cmd_threads = 'N/A'
+    else:
         node_mem = result['node_memory']
         cmd_mem = result['cmd_memory']
         run_seconds = result['run_seconds']
         cmd_threads = result['cmd_threads']
-    except Exception as exc:
-        node_mem = cmd_mem = run_seconds = cmd_threads = 'N/A'
     if status == 'start':
         message  = '{"name":' + '"' + node.name + '"' + ',"id":' + '"' +\
         node._id + '"' + ',"start":' + '"' +str(datetime.datetime.now()) +\

nipype/pipeline/plugins/multiproc.py

@@ -41,13 +41,15 @@ def run_node(node, updatehash, runtime_profile=False):
             # 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)
+            mem_mb, retval = memory_profiler.memory_usage(proc=proc, retval=True,
+                                                          include_children=True,
+                                                          max_usage=True)
             runtime = (datetime.datetime.now() - start).total_seconds()
             result['result'] = retval
             result['node_memory'] = mem_mb[0]/1024.0
+            result['run_seconds'] = runtime
             result['cmd_memory'] = retval.runtime.get('cmd_memory')
             result['cmd_threads'] = retval.runtime.get('cmd_threads')
-            result['run_seconds'] = runtime
         except:
             etype, eval, etr = sys.exc_info()
             result['traceback'] = format_exception(etype,eval,etr)

nipype/pipeline/plugins/tests/test_callback.py

@@ -104,7 +104,3 @@ def test_callback_multiproc_exception():
     yield assert_equal, so.statuses[0][1], 'start'
     yield assert_equal, so.statuses[1][1], 'exception'
     rmtree(wf.base_dir)
-
-if __name__ == '__main__':
-    import nose
-    nose.run()