fix: submit mapnodes should add jobs regardless of slots and provenance writer fails in some situations with map nodes

Author: satra

nipype/pipeline/plugins/base.py

@@ -325,7 +325,7 @@ def _submit_mapnode(self, jobid):
         return False
 
     def _send_procs_to_workers(self, updatehash=False, slots=None, graph=None):
-        """ Sends jobs to workers using ipython's taskclient interface
+        """ Sends jobs to workers
         """
         while np.any(self.proc_done == False):
             # Check to see if a job is available
@@ -346,8 +346,6 @@ def _send_procs_to_workers(self, updatehash=False, slots=None, graph=None):
                             self.proc_pending[jobid] = False
                             continue
                         if num_subnodes > 1:
-                            if num_subnodes > (self.max_jobs - len(self.pending_tasks)):
-                                break
                             submit = self._submit_mapnode(jobid)
                             if not submit:
                                 continue

nipype/pipeline/utils.py

@@ -1101,11 +1101,12 @@ def write_workflow_prov(graph, filename=None, format='turtle'):
                 subresult = InterfaceResult(result.interface[idx],
                                             runtime, outputs={})
                 if result.inputs:
-                    subresult.inputs = result.inputs[idx]
+                    if idx < len(result.inputs):
+                        subresult.inputs = result.inputs[idx]
                 if result.outputs:
                     for key, value in result.outputs.items():
                         values = getattr(result.outputs, key)
-                        if isdefined(values):
+                        if isdefined(values) and idx < len(values):
                             subresult.outputs[key] = values[idx]
                 sub_bundle = ProvStore().add_results(subresult)
                 ps.g = merge_bundles(ps.g, sub_bundle)