From ccc5ef3cf8231ce7498f50e5154c5ea221d4a00b Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Sun, 25 Sep 2016 23:13:02 +0000 Subject: [PATCH 1/4] maybe --- nipype/interfaces/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py index 188053c639..3a2777b0c5 100644 --- a/nipype/interfaces/base.py +++ b/nipype/interfaces/base.py @@ -1366,10 +1366,10 @@ def _get_ram_mb(pid, pyfunc=False): mem_mb = parent_mem/_MB # Iterate through child processes - for child in parent.children(recursive=True): + for child in parent.children(recursive=False): child_mem = child.memory_info().rss if pyfunc: - child_mem -= parent_mem + child_mem -= parent_mem # does not handle indirect children properly mem_mb += child_mem/_MB # Catch if process dies, return gracefully From a04d1bcdef9a85707f165e3aa1f65e90029f1d4c Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Mon, 26 Sep 2016 19:14:50 +0000 Subject: [PATCH 2/4] skip test temporarily; corresponding issue https://github.com/nipy/nipype/issues/1663 --- nipype/interfaces/tests/test_runtime_profiler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nipype/interfaces/tests/test_runtime_profiler.py b/nipype/interfaces/tests/test_runtime_profiler.py index ea306926c7..34848b993c 100644 --- a/nipype/interfaces/tests/test_runtime_profiler.py +++ b/nipype/interfaces/tests/test_runtime_profiler.py @@ -418,6 +418,7 @@ def test_cmdline_profiling(self): msg=threads_err) # Test resources were used as expected + @unittest.skipIf(True) @unittest.skipIf(run_profile == False, skip_profile_msg) def test_function_profiling(self): ''' From 9c9bff172e637db492d83903c4ccceac24443f3c Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Mon, 26 Sep 2016 19:15:32 +0000 Subject: [PATCH 3/4] Revert "maybe" This reverts commit ccc5ef3cf8231ce7498f50e5154c5ea221d4a00b. --- nipype/interfaces/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nipype/interfaces/base.py b/nipype/interfaces/base.py index 3a2777b0c5..188053c639 100644 --- a/nipype/interfaces/base.py +++ b/nipype/interfaces/base.py @@ -1366,10 +1366,10 @@ def _get_ram_mb(pid, pyfunc=False): mem_mb = parent_mem/_MB # Iterate through child processes - for child in parent.children(recursive=False): + for child in parent.children(recursive=True): child_mem = child.memory_info().rss if pyfunc: - child_mem -= parent_mem # does not handle indirect children properly + child_mem -= parent_mem mem_mb += child_mem/_MB # Catch if process dies, return gracefully From 0f85493a58a53baf293ede034c2e44b2ca5cf39a Mon Sep 17 00:00:00 2001 From: Shoshana Berleant Date: Tue, 27 Sep 2016 02:10:29 +0000 Subject: [PATCH 4/4] fix duh --- nipype/interfaces/tests/test_runtime_profiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/interfaces/tests/test_runtime_profiler.py b/nipype/interfaces/tests/test_runtime_profiler.py index 34848b993c..8797eeafce 100644 --- a/nipype/interfaces/tests/test_runtime_profiler.py +++ b/nipype/interfaces/tests/test_runtime_profiler.py @@ -418,7 +418,7 @@ def test_cmdline_profiling(self): msg=threads_err) # Test resources were used as expected - @unittest.skipIf(True) + @unittest.skipIf(True, "https://github.com/nipy/nipype/issues/1663") @unittest.skipIf(run_profile == False, skip_profile_msg) def test_function_profiling(self): '''