fix unconsistency of runtime attributes

Author: oesteban

nipype/pipeline/engine/nodes.py

@@ -749,8 +749,8 @@ def write_report(self, report_type=None, cwd=None):
                         'duration': self.result.runtime.duration}
             # Try and insert memory/threads usage if available
             if resource_monitor:
-                rst_dict['runtime_memory_gb'] = getattr(self.result.runtime, 'mem_peak_gb')
-                rst_dict['runtime_threads'] = getattr(self.result.runtime, 'nthreads_max')
+                rst_dict['mem_peak_gb'] = self.result.runtime.mem_peak_gb
+                rst_dict['cpu_percent'] = self.result.runtime.cpu_percent
 
             if hasattr(self.result.runtime, 'cmdline'):
                 rst_dict['command'] = self.result.runtime.cmdline

nipype/utils/profiler.py

@@ -138,7 +138,7 @@ def log_nodes_cb(node, status):
         'finish': getattr(node.result.runtime, 'endTime'),
         'duration': getattr(node.result.runtime, 'duration'),
         'runtime_threads': getattr(
-            node.result.runtime, 'nthreads_max', 'N/A'),
+            node.result.runtime, 'cpu_percent', 'N/A'),
         'runtime_memory_gb': getattr(
             node.result.runtime, 'mem_peak_gb', 'N/A'),
         'estimated_memory_gb': node.mem_gb,