Merge pull request #508 from hanke/fix/condor_dagman

Close gh-507

Author: satra

nipype/pipeline/plugins/dagman.py

@@ -3,6 +3,7 @@
 
 import os
 import sys
+import uuid
 
 from .base import (GraphPluginBase, logger)
 
@@ -15,9 +16,11 @@ class CondorDAGManPlugin(GraphPluginBase):
     The plugin_args input to run can be used to control the DAGMan execution.
     Currently supported options are:
 
-    - template : submit spec template to use for job submission. The template
-                 all generated submit specs are appended to this template. This
-                 can be a str or a filename.
+    - template : submit spec template for individual jobs in a DAG. All
+                 generated submit spec components (e.g. executable name and
+                 arguments) are appended to this template. This can be a str or
+                 a filename. In the latter case the file content is used as a
+                 template.
     - submit_specs : additional submit specs that are appended to the generated
                  submit specs to allow for overriding or extending the defaults.
                  This can be a str or a filename.
@@ -53,7 +56,7 @@ def _submit_graph(self, pyfiles, dependencies, nodes):
         # location of all scripts, place dagman output in here too
         batch_dir, _ = os.path.split(pyfiles[0])
         # DAG description filename
-        dagfilename = os.path.join(batch_dir, 'workflow.dag')
+        dagfilename = os.path.join(batch_dir, 'workflow-%s.dag' % uuid.uuid4())
         with open(dagfilename, 'wt') as dagfileptr:
             # loop over all scripts, create submit files, and define them
             # as jobs in the DAG