tst: cleaned auto tests and imports

Author: satra

nipype/interfaces/fsl/__init__.py

@@ -21,11 +21,11 @@
 from .epi import (PrepareFieldmap, TOPUP, ApplyTOPUP, Eddy, EPIDeWarp,
                   SigLoss, EddyCorrect, EpiReg)
 
-from .dti import (BEDPOSTX, BEDPOSTXGPU, XFibres, DTIFit,
+from .dti import (BEDPOSTX, XFibres, DTIFit,
                   ProbTrackX, ProbTrackX2,
                   VecReg, ProjThresh, FindTheBiggest, DistanceMap,
                   TractSkeleton, MakeDyadicVectors, BEDPOSTX5, XFibres5,
-                  BEDPOSTX4, XFibres4, BEDPOSTX5GPU, BEDPOSTX4GPU)
+                  BEDPOSTX4, XFibres4)
 from .maths import (ChangeDataType, Threshold, MeanImage, ApplyMask,
                     IsotropicSmooth, TemporalFilter, DilateImage, ErodeImage,
                     SpatialFilter, UnaryMaths, BinaryMaths, MultiImageMaths)

nipype/interfaces/fsl/tests/test_auto_BEDPOSTX.py

@@ -81,6 +81,7 @@ def test_BEDPOSTX_inputs():
     ),
     update_proposal_every=dict(argstr='--updateproposalevery=%d',
     ),
+    use_gpu=dict(),
     )
     inputs = BEDPOSTX.input_spec()
 

nipype/interfaces/fsl/tests/test_auto_BEDPOSTX4.py

@@ -3,11 +3,18 @@
 from nipype.interfaces.fsl.dti import BEDPOSTX4
 
 def test_BEDPOSTX4_inputs():
-    input_map = dict(args=dict(argstr='%s',
+    input_map = dict(all_ard=dict(argstr='--allard',
+    xor=('no_ard', 'all_ard'),
+    ),
+    args=dict(argstr='%s',
     ),
     bpx_directory=dict(argstr='%s',
     usedefault=True,
     ),
+    burn_in=dict(argstr='--burnin=%d',
+    ),
+    burn_in_no_ard=dict(argstr='--burninnoard=%d',
+    ),
     burn_period=dict(argstr='-b %d',
     ),
     bvals=dict(mandatory=True,
@@ -21,25 +28,54 @@ def test_BEDPOSTX4_inputs():
     ),
     fibres=dict(argstr='-n %d',
     ),
+    force_dir=dict(argstr='--forcedir',
+    usedefault=True,
+    ),
+    fudge=dict(argstr='--fudge=%d',
+    ),
+    gradnonlin=dict(argstr='--gradnonlin=%s',
+    ),
     ignore_exception=dict(nohash=True,
     usedefault=True,
     ),
     jumps=dict(argstr='-j %d',
     ),
+    logdir=dict(argstr='--logdir=%s',
+    usedefault=True,
+    ),
     mask=dict(mandatory=True,
     ),
     model=dict(argstr='-model %d',
     ),
+    n_fibres=dict(argstr='--nfibres=%d',
+    ),
+    n_jumps=dict(argstr='--njumps=%d',
+    ),
     nlgradient=dict(argstr='-g',
     ),
+    no_ard=dict(argstr='--noard',
+    xor=('no_ard', 'all_ard'),
+    ),
     no_cuda=dict(argstr='-c',
     ),
+    no_spat=dict(argstr='--nospat',
+    xor=('no_spat', 'non_linear'),
+    ),
+    non_linear=dict(argstr='--nonlinear',
+    xor=('no_spat', 'non_linear'),
+    ),
     output_type=dict(),
+    sample_every=dict(argstr='--sampleevery=%d',
+    ),
     sampling=dict(argstr='-s %d',
     ),
+    seed=dict(argstr='--seed=%d',
+    ),
     terminal_output=dict(mandatory=True,
     nohash=True,
     ),
+    update_proposal_every=dict(argstr='--updateproposalevery=%d',
+    ),
     weight=dict(argstr='-w %.2f',
     ),
     )

nipype/interfaces/fsl/tests/test_auto_BEDPOSTX5.py

@@ -81,6 +81,7 @@ def test_BEDPOSTX5_inputs():
     ),
     update_proposal_every=dict(argstr='--updateproposalevery=%d',
     ),
+    use_gpu=dict(),
     )
     inputs = BEDPOSTX5.input_spec()
 

nipype/interfaces/fsl/tests/test_auto_FSLXCommand.py

@@ -1,6 +1,6 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
 from nipype.testing import assert_equal
-from nipype.interfaces.fsl.base import FSLXCommand
+from nipype.interfaces.fsl.dti import FSLXCommand
 
 def test_FSLXCommand_inputs():
     input_map = dict(all_ard=dict(argstr='--allard',