Skip to content

Commit 9d96f4e

Browse files
committed
REF: jobs -> num_threads in 3dDeconvolve for consistency
1 parent d40a627 commit 9d96f4e

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

nipype/interfaces/afni/model.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class DeconvolveInputSpec(AFNICommandInputSpec):
153153
'instead of the bucket dataset, if possible.',
154154
argstr='-cbucket %s')
155155
out_file = File(desc='output statistics file', argstr='-bucket %s')
156-
jobs = traits.Int(
156+
num_threads = traits.Int(
157157
desc='run the program with provided number of sub-processes',
158158
argstr='-jobs %d')
159159
fout = traits.Bool(
@@ -278,8 +278,6 @@ def _parse_inputs(self, skip=None):
278278
self.inputs.num_glt = len(self.inputs.gltsym)
279279
if not isdefined(self.inputs.out_file):
280280
self.inputs.out_file = 'Decon.nii'
281-
if isdefined(self.inputs.jobs):
282-
self.inputs.num_threads = self.inputs.jobs
283281

284282
return super(Deconvolve, self)._parse_inputs(skip)
285283

nipype/interfaces/afni/tests/test_auto_Deconvolve.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ def test_Deconvolve_inputs():
4949
sep=' ',
5050
),
5151
input1D=dict(argstr='-input1D %s', ),
52-
jobs=dict(argstr='-jobs %d', ),
5352
legendre=dict(argstr='-legendre', ),
5453
local_times=dict(
5554
argstr='-local_times',
@@ -70,10 +69,7 @@ def test_Deconvolve_inputs():
7069
argstr='-num_stimts %d',
7170
position=-6,
7271
),
73-
num_threads=dict(
74-
nohash=True,
75-
usedefault=True,
76-
),
72+
num_threads=dict(argstr='-jobs %d', ),
7773
ortvec=dict(argstr='-ortvec %s %s', ),
7874
out_file=dict(argstr='-bucket %s', ),
7975
outputtype=dict(),

0 commit comments

Comments
 (0)