Skip to content

ENH: Reduce verbosity of distributed plugin #2208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2017
Merged

ENH: Reduce verbosity of distributed plugin #2208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions nipype/pipeline/plugins/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,25 @@ def run(self, graph, config, updatehash=False):
# setup polling - TODO: change to threaded model
notrun = []

old_progress_stats = None
old_presub_stats = None
while not np.all(self.proc_done) or np.any(self.proc_pending):
# Check to see if a job is available (jobs without dependencies not run)
# See https://github.com/nipy/nipype/pull/2200#discussion_r141605722
jobs_ready = np.nonzero(~self.proc_done & (self.depidx.sum(0) == 0))[1]

logger.info('Progress: %d jobs, %d/%d/%d (done/running/ready),'
' %d/%d (pending_tasks/waiting).',
len(self.proc_done),
np.sum(self.proc_done ^ self.proc_pending),
np.sum(self.proc_done & self.proc_pending),
len(jobs_ready),
len(self.pending_tasks),
np.sum(~self.proc_done & ~self.proc_pending))
progress_stats = (len(self.proc_done),
np.sum(self.proc_done ^ self.proc_pending),
np.sum(self.proc_done & self.proc_pending),
len(jobs_ready),
len(self.pending_tasks),
np.sum(~self.proc_done & ~self.proc_pending))
display_stats = progress_stats != old_progress_stats
if display_stats:
logger.debug('Progress: %d jobs, %d/%d/%d '
'(done/running/ready), %d/%d '
'(pending_tasks/waiting).', *progress_stats)
old_progress_stats = progress_stats
toappend = []
# trigger callbacks for any pending results
while self.pending_tasks:
Expand All @@ -163,13 +169,18 @@ def run(self, graph, config, updatehash=False):

if toappend:
self.pending_tasks.extend(toappend)

num_jobs = len(self.pending_tasks)
logger.debug('Tasks currently running: %d. Pending: %d.', num_jobs,
np.sum(self.proc_done & self.proc_pending))
presub_stats = (num_jobs,
np.sum(self.proc_done & self.proc_pending))
display_stats = display_stats or presub_stats != old_presub_stats
if display_stats:
logger.debug('Tasks currently running: %d. Pending: %d.',
*presub_stats)
old_presub_stats = presub_stats
if num_jobs < self.max_jobs:
self._send_procs_to_workers(updatehash=updatehash,
graph=graph)
else:
self._send_procs_to_workers(updatehash=updatehash, graph=graph)
elif display_stats:
logger.debug('Not submitting (max jobs reached)')

sleep(poll_sleep_secs)
Expand Down