Commit 66749024 authored by Jerome Mariette's avatar Jerome Mariette
Browse files

fixe a bug coming from the new version of makeflow 4.4.2

parent 1ea5790d
......@@ -16,7 +16,7 @@
#
[global]
# uncomment and set if not in the PATH, should be version >= 4.2.2
# uncomment and set if not in the PATH, should be version >= 4.4.2
#makeflow = /usr/bin/makeflow
# batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue
batch_system_type = local
......
......@@ -81,7 +81,7 @@
<li><a target="_blank" href="https://www.python.org/">Python</a>: the supported versions are 2.7 or higher.
<li><a target="_blank" href="http://www.cherrypy.org/">Cherrypy</a>: A Minimalist Python Web Framework (python module).</li>
<li><a target="_blank" href="http://www.cse.nd.edu/~ccl/software/makeflow/">Makeflow</a>: a workflow
engine for executing large complex workflows on clusters, clouds, and grids. The supported version are v4.2.2 or higher.</li>
engine for executing large complex workflows on clusters, clouds, and grids. The supported version are v4.4.2 or higher.</li>
</ul>
</section>
......@@ -102,7 +102,7 @@
Here under the required parameters, for advanced configuration please see
<a href="./jflow-advanced-configuration.html">this page</a>...</p>
<pre class="pre-hl "><code class="ini">[global]
# uncomment and set if not in the PATH, should be version >= 4.2.2
# uncomment and set if not in the PATH, should be version >= 4.4.2
#makeflow = /usr/bin/makeflow
# batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue
batch_system_type = local
......
......@@ -91,18 +91,18 @@ class Makeflow(Engine):
# if a symbol is provided
if symbol:
self.dag_file.write('\t@SYMBOL="' + symbol+'"\n')
self.dag_file.write('@SYMBOL="' + symbol+'"\n')
# Write environmental variables
if options.local:
self.dag_file.write('\t@BATCH_LOCAL=1\n')
self.dag_file.write('@BATCH_LOCAL=1\n')
if options.batch:
self.dag_file.write('\t@BATCH_OPTIONS={0}\n'.format(options.batch))
self.dag_file.write('@BATCH_OPTIONS={0}\n'.format(options.batch))
if options.collect:
self.dag_file.write('\t@_MAKEFLOW_COLLECT_LIST+={0}\n'.format(
self.dag_file.write('@_MAKEFLOW_COLLECT_LIST+={0}\n'.format(
' '.join(map(str, options.collect))))
for k, v in options.environment.items():
self.dag_file.write('\t@{0}={1}\n'.format(k, v))
self.dag_file.write('@{0}={1}\n'.format(k, v))
# Write task command
self.dag_file.write('\t{0}\n'.format(command))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment