ENH: Reorder profiler columns

Author: effigies

nipype/interfaces/base/core.py

@@ -530,8 +530,8 @@ def run(self, **inputs):
 
                     runtime.prof_dict = {
                         'time': vals[:, 0].tolist(),
-                        'rss_GiB': (vals[:, 1] / 1024).tolist(),
-                        'cpus': vals[:, 2].tolist(),
+                        'cpus': vals[:, 1].tolist(),
+                        'rss_GiB': (vals[:, 2] / 1024).tolist(),
                         'vms_GiB': (vals[:, 3] / 1024).tolist(),
                     }
 

nipype/pipeline/engine/utils.py

@@ -1362,7 +1362,7 @@ def write_workflow_resources(graph, filename=None, append=None):
                     '(mapflow %d/%d).', nodename, subidx + 1, len(rt_list))
                 continue
 
-            for key in ['time', 'rss_GiB', 'cpus', 'vms_GiB']:
+            for key in ['time', 'cpus', 'rss_GiB', 'vms_GiB']:
                 big_dict[key] += runtime.prof_dict[key]
 
             big_dict['interface'] += [classname] * nsamples

nipype/utils/profiler.py

@@ -94,7 +94,7 @@ def _sample(self, cpu_interval=None):
             except psutil.NoSuchProcess:
                 pass
 
-        print('%f,%f,%f,%f' % (time(), rss / _MB, cpu, vms / _MB),
+        print('%f,%f,%f,%f' % (time(), cpu, rss / _MB, vms / _MB),
               file=self._logfile)
         self._logfile.flush()