Merge branch 'master' into afni_CenterMass

salma1601 · salma1601 · commit 46c4fc641f43 · 2017-10-06T14:07:31.000+02:00
diff --git a/nipype/interfaces/afni/tests/test_auto_ABoverlap.py b/nipype/interfaces/afni/tests/test_auto_ABoverlap.py
@@ -24,6 +24,9 @@ def test_ABoverlap_inputs():
     ),
     no_automask=dict(argstr='-no_automask',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr=' |& tee %s',
     position=-1,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_AFNICommand.py b/nipype/interfaces/afni/tests/test_auto_AFNICommand.py
@@ -12,6 +12,9 @@ def test_AFNICommand_inputs():
     ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source=['in_file'],
     name_template='%s_afni',
diff --git a/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py b/nipype/interfaces/afni/tests/test_auto_AFNIPythonCommand.py
@@ -12,6 +12,9 @@ def test_AFNIPythonCommand_inputs():
     ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source=['in_file'],
     name_template='%s_afni',
diff --git a/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py b/nipype/interfaces/afni/tests/test_auto_AFNItoNIFTI.py
@@ -22,6 +22,9 @@ def test_AFNItoNIFTI_inputs():
     newid=dict(argstr='-newid',
     xor=['oldid'],
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     oldid=dict(argstr='-oldid',
     xor=['newid'],
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_Allineate.py b/nipype/interfaces/afni/tests/test_auto_Allineate.py
@@ -67,6 +67,9 @@ def test_Allineate_inputs():
     ),
     nomask=dict(argstr='-nomask',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     nwarp=dict(argstr='-nwarp %s',
     ),
     nwarp_fixdep=dict(argstr='-nwarp_fixdep%s',
diff --git a/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py b/nipype/interfaces/afni/tests/test_auto_AutoTcorrelate.py
@@ -27,6 +27,9 @@ def test_AutoTcorrelate_inputs():
     mask_source=dict(argstr='-mask_source %s',
     xor=['mask_only_targets'],
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_similarity_matrix.1D',
diff --git a/nipype/interfaces/afni/tests/test_auto_Autobox.py b/nipype/interfaces/afni/tests/test_auto_Autobox.py
@@ -18,6 +18,9 @@ def test_Autobox_inputs():
     ),
     no_clustering=dict(argstr='-noclust',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_autobox',
diff --git a/nipype/interfaces/afni/tests/test_auto_Automask.py b/nipype/interfaces/afni/tests/test_auto_Automask.py
@@ -27,6 +27,9 @@ def test_Automask_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_mask',
diff --git a/nipype/interfaces/afni/tests/test_auto_Axialize.py b/nipype/interfaces/afni/tests/test_auto_Axialize.py
@@ -23,6 +23,9 @@ def test_Axialize_inputs():
     mandatory=True,
     position=-2,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     orientation=dict(argstr='-orient %s',
     ),
     out_file=dict(argstr='-prefix %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_Bandpass.py b/nipype/interfaces/afni/tests/test_auto_Bandpass.py
@@ -44,6 +44,9 @@ def test_Bandpass_inputs():
     ),
     notrans=dict(argstr='-notrans',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     orthogonalize_dset=dict(argstr='-dsort %s',
     ),
     orthogonalize_file=dict(argstr='-ort %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_BlurInMask.py b/nipype/interfaces/afni/tests/test_auto_BlurInMask.py
@@ -28,6 +28,9 @@ def test_BlurInMask_inputs():
     ),
     multimask=dict(argstr='-Mmask %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     options=dict(argstr='%s',
     position=2,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py b/nipype/interfaces/afni/tests/test_auto_BlurToFWHM.py
@@ -25,6 +25,9 @@ def test_BlurToFWHM_inputs():
     ),
     mask=dict(argstr='-blurmaster %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source=['in_file'],
     name_template='%s_afni',
diff --git a/nipype/interfaces/afni/tests/test_auto_Bucket.py b/nipype/interfaces/afni/tests/test_auto_Bucket.py
@@ -16,6 +16,9 @@ def test_Bucket_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_template='buck',
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_Calc.py b/nipype/interfaces/afni/tests/test_auto_Calc.py
@@ -26,6 +26,9 @@ def test_Calc_inputs():
     in_file_c=dict(argstr='-c %s',
     position=2,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     other=dict(argstr='',
     ),
     out_file=dict(argstr='-prefix %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_Cat.py b/nipype/interfaces/afni/tests/test_auto_Cat.py
@@ -18,6 +18,9 @@ def test_Cat_inputs():
     ),
     keepfree=dict(argstr='-nonfixed',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     omitconst=dict(argstr='-nonconst',
     ),
     out_cint=dict(xor=['out_format', 'out_nice', 'out_double', 'out_fint', 'out_int'],
diff --git a/nipype/interfaces/afni/tests/test_auto_CatMatvec.py b/nipype/interfaces/afni/tests/test_auto_CatMatvec.py
@@ -25,6 +25,9 @@ def test_CatMatvec_inputs():
     descr="indicates that the resulting matrix willbe written to outfile in the 'MATRIX(...)' format (FORM 3).This feature could be used, with clever scripting, to inputa matrix directly on the command line to program 3dWarp.",
     xor=['oneline', 'fourxfour'],
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     oneline=dict(argstr='-ONELINE',
     descr='indicates that the resulting matrixwill simply be written as 12 numbers on one line.',
     xor=['matrix', 'fourxfour'],
diff --git a/nipype/interfaces/afni/tests/test_auto_Copy.py b/nipype/interfaces/afni/tests/test_auto_Copy.py
@@ -17,6 +17,9 @@ def test_Copy_inputs():
     mandatory=True,
     position=-2,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='%s',
     name_source='in_file',
     name_template='%s_copy',
diff --git a/nipype/interfaces/afni/tests/test_auto_Deconvolve.py b/nipype/interfaces/afni/tests/test_auto_Deconvolve.py
@@ -74,6 +74,9 @@ def test_Deconvolve_inputs():
     num_stimts=dict(argstr='-num_stimts %d',
     position=-6,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     ortvec=dict(argstr='ortvec %s',
     ),
     out_file=dict(argstr='-bucket %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py b/nipype/interfaces/afni/tests/test_auto_DegreeCentrality.py
@@ -23,6 +23,9 @@ def test_DegreeCentrality_inputs():
     ),
     mask=dict(argstr='-mask %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     oned_file=dict(argstr='-out1D %s',
     ),
     out_file=dict(argstr='-prefix %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_Despike.py b/nipype/interfaces/afni/tests/test_auto_Despike.py
@@ -17,6 +17,9 @@ def test_Despike_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_despike',
diff --git a/nipype/interfaces/afni/tests/test_auto_Detrend.py b/nipype/interfaces/afni/tests/test_auto_Detrend.py
@@ -17,6 +17,9 @@ def test_Detrend_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_detrend',
diff --git a/nipype/interfaces/afni/tests/test_auto_Dot.py b/nipype/interfaces/afni/tests/test_auto_Dot.py
@@ -35,6 +35,9 @@ def test_Dot_inputs():
     ),
     mrange=dict(argstr='-mrange %s %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr=' |& tee %s',
     position=-1,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_ECM.py b/nipype/interfaces/afni/tests/test_auto_ECM.py
@@ -33,6 +33,9 @@ def test_ECM_inputs():
     ),
     memory=dict(argstr='-memory %f',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source=['in_file'],
     name_template='%s_afni',
diff --git a/nipype/interfaces/afni/tests/test_auto_Edge3.py b/nipype/interfaces/afni/tests/test_auto_Edge3.py
@@ -28,6 +28,9 @@ def test_Edge3_inputs():
     nscale=dict(argstr='-nscale',
     xor=['fscale', 'gscale', 'scale_floats'],
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     position=-1,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_Eval.py b/nipype/interfaces/afni/tests/test_auto_Eval.py
@@ -26,6 +26,9 @@ def test_Eval_inputs():
     in_file_c=dict(argstr='-c %s',
     position=2,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     other=dict(argstr='',
     ),
     out1D=dict(argstr='-1D',
diff --git a/nipype/interfaces/afni/tests/test_auto_Fim.py b/nipype/interfaces/afni/tests/test_auto_Fim.py
@@ -24,6 +24,9 @@ def test_Fim_inputs():
     mandatory=True,
     position=1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out=dict(argstr='-out %s',
     position=4,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_Fourier.py b/nipype/interfaces/afni/tests/test_auto_Fourier.py
@@ -23,6 +23,9 @@ def test_Fourier_inputs():
     lowpass=dict(argstr='-lowpass %f',
     mandatory=True,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_fourier',
diff --git a/nipype/interfaces/afni/tests/test_auto_LFCD.py b/nipype/interfaces/afni/tests/test_auto_LFCD.py
@@ -23,6 +23,9 @@ def test_LFCD_inputs():
     ),
     mask=dict(argstr='-mask %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source=['in_file'],
     name_template='%s_afni',
diff --git a/nipype/interfaces/afni/tests/test_auto_MaskTool.py b/nipype/interfaces/afni/tests/test_auto_MaskTool.py
@@ -35,6 +35,9 @@ def test_MaskTool_inputs():
     ),
     inter=dict(argstr='-inter',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_mask',
diff --git a/nipype/interfaces/afni/tests/test_auto_Maskave.py b/nipype/interfaces/afni/tests/test_auto_Maskave.py
@@ -20,6 +20,9 @@ def test_Maskave_inputs():
     mask=dict(argstr='-mask %s',
     position=1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='> %s',
     keep_extension=True,
     name_source='in_file',
diff --git a/nipype/interfaces/afni/tests/test_auto_Means.py b/nipype/interfaces/afni/tests/test_auto_Means.py
@@ -29,6 +29,9 @@ def test_Means_inputs():
     ),
     non_zero=dict(argstr='-non_zero',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file_a',
     name_template='%s_mean',
diff --git a/nipype/interfaces/afni/tests/test_auto_Merge.py b/nipype/interfaces/afni/tests/test_auto_Merge.py
@@ -22,6 +22,9 @@ def test_Merge_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_merge',
diff --git a/nipype/interfaces/afni/tests/test_auto_Notes.py b/nipype/interfaces/afni/tests/test_auto_Notes.py
@@ -24,6 +24,9 @@ def test_Notes_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='%s',
     ),
     outputtype=dict(),
diff --git a/nipype/interfaces/afni/tests/test_auto_Qwarp.py b/nipype/interfaces/afni/tests/test_auto_Qwarp.py
@@ -98,6 +98,9 @@ def test_Qwarp_inputs():
     ),
     noweight=dict(argstr='-noweight',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     genfile=True,
     name_source=['in_file'],
diff --git a/nipype/interfaces/afni/tests/test_auto_Remlfit.py b/nipype/interfaces/afni/tests/test_auto_Remlfit.py
@@ -57,6 +57,9 @@ def test_Remlfit_inputs():
     ),
     nofdr=dict(argstr='-noFDR',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     obeta=dict(argstr='-Obeta %s',
     ),
     obuck=dict(argstr='-Obuck %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_Resample.py b/nipype/interfaces/afni/tests/test_auto_Resample.py
@@ -19,6 +19,9 @@ def test_Resample_inputs():
     ),
     master=dict(argstr='-master %s',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     orientation=dict(argstr='-orient %s',
     ),
     out_file=dict(argstr='-prefix %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_Retroicor.py b/nipype/interfaces/afni/tests/test_auto_Retroicor.py
@@ -24,6 +24,9 @@ def test_Retroicor_inputs():
     mandatory=True,
     position=-1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     order=dict(argstr='-order %s',
     position=-5,
     ),
diff --git a/nipype/interfaces/afni/tests/test_auto_SVMTest.py b/nipype/interfaces/afni/tests/test_auto_SVMTest.py
@@ -26,6 +26,9 @@ def test_SVMTest_inputs():
     ),
     nopredcensord=dict(argstr='-nopredcensord',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     options=dict(argstr='%s',
     ),
     out_file=dict(argstr='-predictions %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_SVMTrain.py b/nipype/interfaces/afni/tests/test_auto_SVMTrain.py
@@ -38,6 +38,9 @@ def test_SVMTrain_inputs():
     ),
     nomodelmask=dict(argstr='-nomodelmask',
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     options=dict(argstr='%s',
     ),
     out_file=dict(argstr='-bucket %s',
diff --git a/nipype/interfaces/afni/tests/test_auto_SkullStrip.py b/nipype/interfaces/afni/tests/test_auto_SkullStrip.py
@@ -17,6 +17,9 @@ def test_SkullStrip_inputs():
     mandatory=True,
     position=1,
     ),
+    num_threads=dict(nohash=True,
+    usedefault=True,
+    ),
     out_file=dict(argstr='-prefix %s',
     name_source='in_file',
     name_template='%s_skullstrip',
diff --git a/nipype/interfaces/afni/tests/test_auto_TCat.py b/nipype/interfaces/afni/tests/test_auto_TCat.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TCorr1D.py b/nipype/interfaces/afni/tests/test_auto_TCorr1D.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TCorrMap.py b/nipype/interfaces/afni/tests/test_auto_TCorrMap.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TCorrelate.py b/nipype/interfaces/afni/tests/test_auto_TCorrelate.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TNorm.py b/nipype/interfaces/afni/tests/test_auto_TNorm.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TShift.py b/nipype/interfaces/afni/tests/test_auto_TShift.py
diff --git a/nipype/interfaces/afni/tests/test_auto_TStat.py b/nipype/interfaces/afni/tests/test_auto_TStat.py
diff --git a/nipype/interfaces/afni/tests/test_auto_To3D.py b/nipype/interfaces/afni/tests/test_auto_To3D.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Undump.py b/nipype/interfaces/afni/tests/test_auto_Undump.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Unifize.py b/nipype/interfaces/afni/tests/test_auto_Unifize.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Volreg.py b/nipype/interfaces/afni/tests/test_auto_Volreg.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Warp.py b/nipype/interfaces/afni/tests/test_auto_Warp.py
diff --git a/nipype/interfaces/afni/tests/test_auto_ZCutUp.py b/nipype/interfaces/afni/tests/test_auto_ZCutUp.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Zcat.py b/nipype/interfaces/afni/tests/test_auto_Zcat.py
diff --git a/nipype/interfaces/afni/tests/test_auto_Zeropad.py b/nipype/interfaces/afni/tests/test_auto_Zeropad.py
diff --git a/nipype/interfaces/freesurfer/preprocess.py b/nipype/interfaces/freesurfer/preprocess.py
diff --git a/nipype/pipeline/engine/nodes.py b/nipype/pipeline/engine/nodes.py
diff --git a/nipype/pipeline/plugins/multiproc.py b/nipype/pipeline/plugins/multiproc.py
diff --git a/nipype/utils/config.py b/nipype/utils/config.py
diff --git a/nipype/utils/tests/test_config.py b/nipype/utils/tests/test_config.py
