Skip to content

Commit 504858e

Browse files
committed
Merge pull request #786 from satra/fix/slurm
fix: showq may not be available on all slurm systems
2 parents 699df35 + 509fb38 commit 504858e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

nipype/pipeline/plugins/slurm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def __init__(self, **kwargs):
5454
if 'sbatch_args' in kwargs['plugin_args']:
5555
self._sbatch_args = kwargs['plugin_args']['sbatch_args']
5656
self._pending = {}
57-
super(SLURMPlugin, self).__init__(template, **kwargs)
57+
super(SLURMPlugin, self).__init__(self._template, **kwargs)
5858

5959
def _is_pending(self, taskid):
6060
# subprocess.Popen requires taskid to be a string
61-
proc = subprocess.Popen(["showq", '-u'],
61+
proc = subprocess.Popen(["squeue", '-j', '%s' % taskid],
6262
stdout=subprocess.PIPE,
6363
stderr=subprocess.PIPE)
6464
o, _ = proc.communicate()

0 commit comments

Comments
 (0)