Merge pull request #2816 from satra/fix/profiler

[FIX] Indices were swapped for memory and cpu profile data

Author: effigies

nipype/interfaces/base/core.py

@@ -563,8 +563,8 @@ def run(self, cwd=None, ignore_exception=None, **inputs):
                 vals = np.loadtxt(mon_sp.fname, delimiter=',')
                 if vals.size:
                     vals = np.atleast_2d(vals)
-                    runtime.mem_peak_gb = vals[:, 1].max() / 1024
-                    runtime.cpu_percent = vals[:, 2].max()
+                    runtime.mem_peak_gb = vals[:, 2].max() / 1024
+                    runtime.cpu_percent = vals[:, 1].max()
 
                     runtime.prof_dict = {
                         'time': vals[:, 0].tolist(),