Skip to content

Commit 3113d1f

Browse files
authored
Merge pull request #1610 from satra/fix/config
reduce debug statements
2 parents 0f9a620 + a01cfcd commit 3113d1f

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

nipype/pipeline/plugins/multiproc.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from copy import deepcopy
1818
import numpy as np
1919

20-
from ... import logging
20+
from ... import logging, config
2121
from ...utils.misc import str2bool
2222
from ..engine import MapNode
2323
from ..plugins import semaphore_singleton
@@ -223,15 +223,18 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):
223223
key=lambda item: (self.procs[item]._interface.estimated_memory_gb,
224224
self.procs[item]._interface.num_threads))
225225

226-
logger.debug('Free memory (GB): %d, Free processors: %d',
227-
free_memory_gb, free_processors)
226+
if str2bool(config.get('execution', 'profile_runtime')):
227+
logger.debug('Free memory (GB): %d, Free processors: %d',
228+
free_memory_gb, free_processors)
228229

229230
# While have enough memory and processors for first job
230231
# Submit first job on the list
231232
for jobid in jobids:
232-
logger.debug('Next Job: %d, memory (GB): %d, threads: %d' \
233-
% (jobid, self.procs[jobid]._interface.estimated_memory_gb,
234-
self.procs[jobid]._interface.num_threads))
233+
if str2bool(config.get('execution', 'profile_runtime')):
234+
logger.debug('Next Job: %d, memory (GB): %d, threads: %d' \
235+
% (jobid,
236+
self.procs[jobid]._interface.estimated_memory_gb,
237+
self.procs[jobid]._interface.num_threads))
235238

236239
if self.procs[jobid]._interface.estimated_memory_gb <= free_memory_gb and \
237240
self.procs[jobid]._interface.num_threads <= free_processors:
@@ -307,5 +310,3 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):
307310
self.pending_tasks.insert(0, (tid, jobid))
308311
else:
309312
break
310-
311-
logger.debug('No jobs waiting to execute')

tools/run_examples.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ def run_examples(example, pipelines, data_path, plugin=None, rm_base_dir=True):
3737
os.makedirs(log_dir)
3838
wf.config = {'execution': {'hash_method': 'timestamp',
3939
'stop_on_first_rerun': 'true',
40-
'write_provenance': 'true'},
40+
'write_provenance': 'true',
41+
'poll_sleep_duration': 2},
4142
'logging': {'log_directory': log_dir, 'log_to_file': True}}
4243
try:
4344
wf.inputs.inputnode.in_data = os.path.abspath(data_path)

0 commit comments

Comments
 (0)