rss/vms_gb -> rss/vms_GiB

Author: effigies

nipype/interfaces/base/core.py

@@ -518,21 +518,21 @@ def run(self, **inputs):
                 import numpy as np
                 mon_sp.stop()
 
-                runtime.mem_peak_gb = None
+                runtime.mem_peak_GiB = None
                 runtime.cpu_percent = None
 
                 # Read .prof file in and set runtime values
                 vals = np.loadtxt(mon_sp.fname, delimiter=',')
                 if vals.size:
                     vals = np.atleast_2d(vals)
-                    runtime.mem_peak_gb = vals[:, 1].max() / 1024
+                    runtime.mem_peak_GiB = vals[:, 1].max() / 1024
                     runtime.cpu_percent = vals[:, 2].max()
 
                     runtime.prof_dict = {
                         'time': vals[:, 0].tolist(),
-                        'rss_gb': (vals[:, 1] / 1024).tolist(),
+                        'rss_GiB': (vals[:, 1] / 1024).tolist(),
                         'cpus': vals[:, 2].tolist(),
-                        'vms_gb': (vals[:, 3] / 1024).tolist(),
+                        'vms_GiB': (vals[:, 3] / 1024).tolist(),
                     }
 
         return results

nipype/pipeline/engine/utils.py

@@ -1320,8 +1320,8 @@ def write_workflow_resources(graph, filename=None, append=None):
         'time': [],
         'name': [],
         'interface': [],
-        'rss_gb': [],
-        'vms_gb': [],
+        'rss_GiB': [],
+        'vms_GiB': [],
         'cpus': [],
         'mapnode': [],
         'params': [],
@@ -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_gb', 'cpus', 'vms_gb']:
+            for key in ['time', 'rss_GiB', 'cpus', 'vms_GiB']:
                 big_dict[key] += runtime.prof_dict[key]
 
             big_dict['interface'] += [classname] * nsamples

nipype/utils/profiler.py

@@ -140,9 +140,9 @@ def log_nodes_cb(node, status):
         'duration': getattr(node.result.runtime, 'duration'),
         'runtime_threads': getattr(
             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,
+        'runtime_memory_GiB': getattr(
+            node.result.runtime, 'mem_peak_GiB', 'N/A'),
+        'estimated_memory_GiB': node.mem_gb,
         'num_threads': node.n_procs,
     }