Merge branch 'master' into enh/resolve-rebase-paths

Author: oesteban

nipype/interfaces/base/core.py

@@ -204,10 +204,10 @@ def _check_requires(self, spec, name, value):
             ]
             if any(values) and isdefined(value):
                 if len(values) > 1:
-                    fmt = ("%s requires values for inputs %s because '%s' is set. " 
+                    fmt = ("%s requires values for inputs %s because '%s' is set. "
                            "For a list of required inputs, see %s.help()")
                 else:
-                    fmt = ("%s requires a value for input %s because '%s' is set. " 
+                    fmt = ("%s requires a value for input %s because '%s' is set. "
                            "For a list of required inputs, see %s.help()")
                 msg = fmt % (self.__class__.__name__,
                              ', '.join("'%s'" % req for req in spec.requires),
@@ -450,34 +450,36 @@ def _list_outputs(self):
             return None
 
     def aggregate_outputs(self, runtime=None, needed_outputs=None):
-        """ Collate expected outputs and check for existence
-        """
-
-        predicted_outputs = self._list_outputs()
-        outputs = self._outputs()
-        if predicted_outputs:
-            _unavailable_outputs = []
-            if outputs:
-                _unavailable_outputs = \
-                    self._check_version_requirements(self._outputs())
-            for key, val in list(predicted_outputs.items()):
-                if needed_outputs and key not in needed_outputs:
-                    continue
-                if key in _unavailable_outputs:
-                    raise KeyError(('Output trait %s not available in version '
-                                    '%s of interface %s. Please inform '
-                                    'developers.') % (key, self.version,
-                                                      self.__class__.__name__))
-                try:
-                    setattr(outputs, key, val)
-                except TraitError as error:
-                    if getattr(error, 'info',
-                               'default').startswith('an existing'):
-                        msg = ("File/Directory '%s' not found for %s output "
-                               "'%s'." % (val, self.__class__.__name__, key))
-                        raise FileNotFoundError(msg)
-                    raise error
+        """Collate expected outputs and apply output traits validation."""
+        outputs = self._outputs()  # Generate an empty output spec object
+        predicted_outputs = self._list_outputs()  # Predictions from _list_outputs
+        if not predicted_outputs:
+            return outputs
 
+        # Precalculate the list of output trait names that should be aggregated
+        aggregate_names = set(predicted_outputs)
+        if needed_outputs is not None:
+            aggregate_names = set(needed_outputs).intersection(aggregate_names)
+
+        if aggregate_names:  # Make sure outputs are compatible
+            _na_outputs = self._check_version_requirements(outputs)
+            na_names = aggregate_names.intersection(_na_outputs)
+            if na_names:
+                # XXX Change to TypeError in Nipype 2.0
+                raise KeyError("""\
+Output trait(s) %s not available in version %s of interface %s.\
+""" % (', '.join(na_names), self.version, self.__class__.__name__))
+
+        for key in aggregate_names:  # Final aggregation
+            val = predicted_outputs[key]
+            try:
+                setattr(outputs, key, val)
+            except TraitError as error:
+                if 'an existing' in getattr(error, 'info', 'default'):
+                    msg = "No such file or directory for output '%s' of a %s interface" % \
+                        (key, self.__class__.__name__)
+                    raise FileNotFoundError(val, message=msg)
+                raise error
         return outputs
 
     @property

nipype/interfaces/mrtrix3/base.py

@@ -48,12 +48,14 @@ class MRTrix3BaseInputSpec(CommandLineInputSpec):
     grad_file = File(
         exists=True,
         argstr='-grad %s',
-        desc='dw gradient scheme (MRTrix format')
+        desc='dw gradient scheme (MRTrix format)',
+        xor=['grad_fsl'])
     grad_fsl = Tuple(
         File(exists=True),
         File(exists=True),
         argstr='-fslgrad %s %s',
-        desc='(bvecs, bvals) dw gradient scheme (FSL format')
+        desc='(bvecs, bvals) dw gradient scheme (FSL format)',
+        xor=['grad_file'])
     bval_scale = traits.Enum(
         'yes',
         'no',

nipype/interfaces/mrtrix3/preprocess.py

@@ -23,19 +23,24 @@ class DWIDenoiseInputSpec(MRTrix3BaseInputSpec):
         argstr='-mask %s',
         position=1,
         desc='mask image')
-    extent = Tuple((traits.Int, traits.Int, traits.Int),
+    extent = Tuple(
+        (traits.Int, traits.Int, traits.Int),
         argstr='-extent %d,%d,%d',
         desc='set the window size of the denoising filter. (default = 5,5,5)')
     noise = File(
         argstr='-noise %s',
-        desc='the output noise map')
-    out_file = File(name_template='%s_denoised',
+        name_template='%s_noise',
         name_source='in_file',
         keep_extension=True,
+        desc='the output noise map')
+    out_file = File(
         argstr='%s',
         position=-1,
-        desc='the output denoised DWI image',
-        genfile=True)
+        name_template='%s_denoised',
+        name_source='in_file',
+        keep_extension=True,
+        desc='the output denoised DWI image')
+
 
 class DWIDenoiseOutputSpec(TraitedSpec):
     noise = File(desc='the output noise map', exists=True)
@@ -67,22 +72,16 @@ class DWIDenoise(MRTrix3Base):
     >>> denoise = mrt.DWIDenoise()
     >>> denoise.inputs.in_file = 'dwi.mif'
     >>> denoise.inputs.mask = 'mask.mif'
+    >>> denoise.inputs.noise = 'noise.mif'
     >>> denoise.cmdline                               # doctest: +ELLIPSIS
-    'dwidenoise -mask mask.mif dwi.mif dwi_denoised.mif'
+    'dwidenoise -mask mask.mif -noise noise.mif dwi.mif dwi_denoised.mif'
     >>> denoise.run()                                 # doctest: +SKIP
     """
 
     _cmd = 'dwidenoise'
     input_spec = DWIDenoiseInputSpec
     output_spec = DWIDenoiseOutputSpec
 
-    def _list_outputs(self):
-        outputs = self.output_spec().get()
-        outputs['out_file'] = op.abspath(self.inputs.out_file)
-        if self.inputs.noise != Undefined:
-            outputs['noise'] = op.abspath(self.inputs.noise)
-        return outputs
-
 
 class MRDeGibbsInputSpec(MRTrix3BaseInputSpec):
     in_file = File(
@@ -92,7 +91,7 @@ class MRDeGibbsInputSpec(MRTrix3BaseInputSpec):
         mandatory=True,
         desc='input DWI image')
     axes = traits.ListInt(
-        default_value=[0,1],
+        default_value=[0, 1],
         usedefault=True,
         sep=',',
         minlen=2,
@@ -117,13 +116,13 @@ class MRDeGibbsInputSpec(MRTrix3BaseInputSpec):
         argstr='-maxW %d',
         desc='right border of window used for total variation (TV) computation '
              '(default = 3)')
-    out_file = File(name_template='%s_unr',
+    out_file = File(
+        name_template='%s_unr',
         name_source='in_file',
         keep_extension=True,
         argstr='%s',
         position=-1,
-        desc='the output unringed DWI image',
-        genfile=True)
+        desc='the output unringed DWI image')
 
 class MRDeGibbsOutputSpec(TraitedSpec):
     out_file = File(desc='the output unringed DWI image', exists=True)
@@ -179,31 +178,21 @@ class DWIBiasCorrectInputSpec(MRTrix3BaseInputSpec):
     in_mask = File(
         argstr='-mask %s',
         desc='input mask image for bias field estimation')
-    _xor_methods = ('use_ants', 'use_fsl')
     use_ants = traits.Bool(
-        default_value=True,
-        usedefault=True,
         argstr='-ants',
+        mandatory=True,
         desc='use ANTS N4 to estimate the inhomogeneity field',
-        xor=_xor_methods)
+        xor=['use_fsl'])
     use_fsl = traits.Bool(
         argstr='-fsl',
+        mandatory=True,
         desc='use FSL FAST to estimate the inhomogeneity field',
-        xor=_xor_methods,
-        min_ver='5.0.10')
-    _xor_grads = ('mrtrix_grad', 'fsl_grad')
-    mrtrix_grad = File(
-        argstr='-grad %s',
-        desc='diffusion gradient table in MRtrix format',
-        xor=_xor_grads)
-    fsl_grad = File(
-        argstr='-fslgrad %s %s',
-        desc='diffusion gradient table in FSL bvecs/bvals format',
-        xor=_xor_grads)
+        xor=['use_ants'])
     bias = File(
         argstr='-bias %s',
         desc='bias field')
-    out_file = File(name_template='%s_biascorr',
+    out_file = File(
+        name_template='%s_biascorr',
         name_source='in_file',
         keep_extension=True,
         argstr='%s',
@@ -228,6 +217,7 @@ class DWIBiasCorrect(MRTrix3Base):
     >>> import nipype.interfaces.mrtrix3 as mrt
     >>> bias_correct = mrt.DWIBiasCorrect()
     >>> bias_correct.inputs.in_file = 'dwi.mif'
+    >>> bias_correct.inputs.use_ants = True
     >>> bias_correct.cmdline
     'dwibiascorrect -ants dwi.mif dwi_biascorr.mif'
     >>> bias_correct.run()                             # doctest: +SKIP
@@ -237,13 +227,6 @@ class DWIBiasCorrect(MRTrix3Base):
     input_spec = DWIBiasCorrectInputSpec
     output_spec = DWIBiasCorrectOutputSpec
 
-    def _list_outputs(self):
-        outputs = self.output_spec().get()
-        outputs['out_file'] = op.abspath(self.inputs.out_file)
-        if self.inputs.bias != Undefined:
-            outputs['bias'] = op.abspath(self.inputs.bias)
-        return outputs
-
 
 class ResponseSDInputSpec(MRTrix3BaseInputSpec):
     algorithm = traits.Enum(

nipype/interfaces/mrtrix3/tests/test_auto_DWIBiasCorrect.py

@@ -15,16 +15,15 @@ def test_DWIBiasCorrect_inputs():
             nohash=True,
             usedefault=True,
         ),
-        fsl_grad=dict(
-            argstr='-fslgrad %s %s',
-            extensions=None,
-            xor=('mrtrix_grad', 'fsl_grad'),
-        ),
         grad_file=dict(
             argstr='-grad %s',
             extensions=None,
+            xor=['grad_fsl'],
+        ),
+        grad_fsl=dict(
+            argstr='-fslgrad %s %s',
+            xor=['grad_file'],
         ),
-        grad_fsl=dict(argstr='-fslgrad %s %s', ),
         in_bval=dict(extensions=None, ),
         in_bvec=dict(
             argstr='-fslgrad %s %s',
@@ -40,11 +39,6 @@ def test_DWIBiasCorrect_inputs():
             argstr='-mask %s',
             extensions=None,
         ),
-        mrtrix_grad=dict(
-            argstr='-grad %s',
-            extensions=None,
-            xor=('mrtrix_grad', 'fsl_grad'),
-        ),
         nthreads=dict(
             argstr='-nthreads %d',
             nohash=True,
@@ -60,13 +54,13 @@ def test_DWIBiasCorrect_inputs():
         ),
         use_ants=dict(
             argstr='-ants',
-            usedefault=True,
-            xor=('use_ants', 'use_fsl'),
+            mandatory=True,
+            xor=['use_fsl'],
         ),
         use_fsl=dict(
             argstr='-fsl',
-            min_ver='5.0.10',
-            xor=('use_ants', 'use_fsl'),
+            mandatory=True,
+            xor=['use_ants'],
         ),
     )
     inputs = DWIBiasCorrect.input_spec()

nipype/interfaces/mrtrix3/tests/test_auto_DWIDenoise.py

@@ -15,8 +15,12 @@ def test_DWIDenoise_inputs():
         grad_file=dict(
             argstr='-grad %s',
             extensions=None,
+            xor=['grad_fsl'],
+        ),
+        grad_fsl=dict(
+            argstr='-fslgrad %s %s',
+            xor=['grad_file'],
         ),
-        grad_fsl=dict(argstr='-fslgrad %s %s', ),
         in_bval=dict(extensions=None, ),
         in_bvec=dict(
             argstr='-fslgrad %s %s',
@@ -36,6 +40,9 @@ def test_DWIDenoise_inputs():
         noise=dict(
             argstr='-noise %s',
             extensions=None,
+            keep_extension=True,
+            name_source='in_file',
+            name_template='%s_noise',
         ),
         nthreads=dict(
             argstr='-nthreads %d',
@@ -44,7 +51,6 @@ def test_DWIDenoise_inputs():
         out_file=dict(
             argstr='%s',
             extensions=None,
-            genfile=True,
             keep_extension=True,
             name_source='in_file',
             name_template='%s_denoised',

nipype/interfaces/mrtrix3/tests/test_auto_MRDeGibbs.py

@@ -21,8 +21,12 @@ def test_MRDeGibbs_inputs():
         grad_file=dict(
             argstr='-grad %s',
             extensions=None,
+            xor=['grad_fsl'],
+        ),
+        grad_fsl=dict(
+            argstr='-fslgrad %s %s',
+            xor=['grad_file'],
         ),
-        grad_fsl=dict(argstr='-fslgrad %s %s', ),
         in_bval=dict(extensions=None, ),
         in_bvec=dict(
             argstr='-fslgrad %s %s',
@@ -53,7 +57,6 @@ def test_MRDeGibbs_inputs():
         out_file=dict(
             argstr='%s',
             extensions=None,
-            genfile=True,
             keep_extension=True,
             name_source='in_file',
             name_template='%s_unr',