Skip to content

FIX: Collect jobids in a numpy 1.9 compatible manner #2378

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
Jan 19, 2018
Merged

FIX: Collect jobids in a numpy 1.9 compatible manner #2378

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
4 changes: 3 additions & 1 deletion nipype/pipeline/plugins/multiproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ def _send_procs_to_workers(self, updatehash=False, graph=None):

# Check to see if a job is available (jobs with all dependencies run)
# See https://github.com/nipy/nipype/pull/2200#discussion_r141605722
jobids = np.nonzero(~self.proc_done & (self.depidx.sum(0) == 0))[1]
# See also https://github.com/nipy/nipype/issues/2372
jobids = np.flatnonzero(~self.proc_done &
(self.depidx.sum(axis=0) == 0).__array__())

# Check available resources by summing all threads and memory used
free_memory_gb, free_processors = self._check_resources(
Expand Down