Merge pull request #428 from chrisfilo/fix.mapnode_array

Fixed mapnode isdefined bug

Author: satra

nipype/interfaces/tests/test_utility.py

@@ -6,22 +6,24 @@
 
 from nipype.testing import assert_equal, assert_true
 from nipype.interfaces import utility
+import nipype.pipeline.engine as pe
+
 
 def test_rename():
     tempdir = os.path.realpath(mkdtemp())
     origdir = os.getcwd()
     os.chdir(tempdir)
 
     # Test very simple rename
-    _ = open("file.txt","w").close()
+    _ = open("file.txt", "w").close()
     rn = utility.Rename(in_file="file.txt", format_string="test_file1.txt")
     res = rn.run()
     outfile = os.path.join(tempdir, "test_file1.txt")
     yield assert_equal, res.outputs.out_file, outfile
     yield assert_true, os.path.exists(outfile)
 
     # Now a string-formatting version
-    rn = utility.Rename(in_file="file.txt", format_string="%(field1)s_file%(field2)d",keep_ext=True)
+    rn = utility.Rename(in_file="file.txt", format_string="%(field1)s_file%(field2)d", keep_ext=True)
     # Test .input field creation
     yield assert_true, hasattr(rn.inputs, "field1")
     yield assert_true, hasattr(rn.inputs, "field2")
@@ -36,3 +38,31 @@ def test_rename():
     # Clean up
     os.chdir(origdir)
     shutil.rmtree(tempdir)
+
+
+def test_function():
+    tempdir = os.path.realpath(mkdtemp())
+    origdir = os.getcwd()
+    os.chdir(tempdir)
+
+    def gen_random_array(size):
+        import numpy as np
+        return np.random.rand(size, size)
+
+    f1 = pe.MapNode(utility.Function(input_names=['size'], output_names=['random_array'], function=gen_random_array), name='random_array', iterfield=['size'])
+    f1.inputs.size = [2, 3, 5]
+
+    wf = pe.Workflow(name="test_workflow")
+
+    def increment_array(in_array):
+        return in_array + 1
+
+    f2 = pe.MapNode(utility.Function(input_names=['in_array'], output_names=['out_array'], function=increment_array), name='increment_array', iterfield=['in_array'])
+
+    wf.connect(f1, 'random_array', f2, 'in_array')
+
+    wf.run()
+
+    # Clean up
+    os.chdir(origdir)
+    shutil.rmtree(tempdir)

nipype/pipeline/engine.py

@@ -1641,7 +1641,7 @@ def _collate_results(self, nodes):
                         values.insert(i, node.result.outputs.get()[key])
                     else:
                         values.insert(i, None)
-                    if any([val != Undefined for val in values]) and \
+                    if any([isdefined(val) for val in values]) and \
                        self._result.outputs:
                         setattr(self._result.outputs, key, values)
         if returncode and any([code is not None for code in returncode]):