Changed runtime unit test tolerance to GB instead of %

Author: pintohutch

nipype/interfaces/tests/test_runtime_profiler.py

@@ -86,7 +86,7 @@ def _use_gb_ram(num_gb):
     # Build thread list
     thread_list = []
     for idx in range(num_threads):
-        thread = Process(target=_use_gb_ram, args=(num_gb/num_threads,),
+        thread = Thread(target=_use_gb_ram, args=(num_gb/num_threads,),
                         name=str(idx))
         thread_list.append(thread)
 
@@ -130,11 +130,11 @@ def setUp(self):
 
         # Init parameters
         # Input RAM GB to occupy
-        self.num_gb = 1.0
+        self.num_gb = 0.5
         # Input number of sub-threads (not including parent threads)
         self.num_threads = 2
         # Acceptable percent error for memory profiled against input
-        self.mem_err_percent = 25
+        self.mem_err_gb = 0.25
 
     # ! Only used for benchmarking the profiler over a range of
     # ! RAM usage and number of threads
@@ -380,14 +380,14 @@ def test_cmdline_profiling(self):
         runtime_threads = int(node_stats['runtime_threads'])
 
         # Get margin of error for RAM GB
-        allowed_gb_err = (self.mem_err_percent/100.0)*num_gb
+        allowed_gb_err = self.mem_err_gb
         runtime_gb_err = np.abs(runtime_gb-num_gb)
         # 
         expected_runtime_threads = num_threads
 
         # Error message formatting
-        mem_err = 'Input memory: %f is not within %.1f%% of runtime '\
-                  'memory: %f' % (num_gb, self.mem_err_percent, runtime_gb)
+        mem_err = 'Input memory: %f is not within %.3f GB of runtime '\
+                  'memory: %f' % (num_gb, self.mem_err_gb, runtime_gb)
         threads_err = 'Input threads: %d is not equal to runtime threads: %d' \
                     % (expected_runtime_threads, runtime_threads)
 
@@ -421,14 +421,14 @@ def test_function_profiling(self):
         runtime_threads = int(node_stats['runtime_threads'])
 
         # Get margin of error for RAM GB
-        allowed_gb_err = (self.mem_err_percent/100.0)*num_gb
+        allowed_gb_err = self.mem_err_gb
         runtime_gb_err = np.abs(runtime_gb-num_gb)
         # 
         expected_runtime_threads = num_threads
 
         # Error message formatting
-        mem_err = 'Input memory: %f is not within %.1f%% of runtime '\
-                  'memory: %f' % (num_gb, self.mem_err_percent, runtime_gb)
+        mem_err = 'Input memory: %f is not within %.3f GB of runtime '\
+                  'memory: %f' % (num_gb, self.mem_err_gb, runtime_gb)
         threads_err = 'Input threads: %d is not equal to runtime threads: %d' \
                     % (expected_runtime_threads, runtime_threads)
 

nipype/interfaces/tests/use_resources

@@ -56,7 +56,7 @@ if __name__ == '__main__':
     # Build thread list
     thread_list = []
     for idx in range(num_threads):
-        thread_list.append(Process(target=use_gb_ram, args=(num_gb/num_threads,)))
+        thread_list.append(Thread(target=use_gb_ram, args=(num_gb/num_threads,)))
 
     # Run multi-threaded
     print('Using %.3f GB of memory over %d sub-threads...' % \