Commit 72cef85c authored by Jerome Mariette's avatar Jerome Mariette
Browse files

upgrade for makeflow 4.4.3

parent ef23c678
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# #
[global] [global]
# uncomment and set if not in the PATH, should be version >= 4.4.2 # uncomment and set if not in the PATH, should be version >= 4.4.3
#makeflow = /usr/bin/makeflow #makeflow = /usr/bin/makeflow
# batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue # batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue
batch_system_type = local batch_system_type = local
......
...@@ -81,7 +81,7 @@ ...@@ -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="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.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 <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.4.2 or higher.</li> engine for executing large complex workflows on clusters, clouds, and grids. The supported version are v4.4.3 or higher.</li>
</ul> </ul>
</section> </section>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
Here under the required parameters, for advanced configuration please see Here under the required parameters, for advanced configuration please see
<a href="./jflow-advanced-configuration.html">this page</a>...</p> <a href="./jflow-advanced-configuration.html">this page</a>...</p>
<pre class="pre-hl "><code class="ini">[global] <pre class="pre-hl "><code class="ini">[global]
# uncomment and set if not in the PATH, should be version >= 4.4.2 # uncomment and set if not in the PATH, should be version >= 4.4.3
#makeflow = /usr/bin/makeflow #makeflow = /usr/bin/makeflow
# batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue # batch system type: local, condor, sge, moab, cluster, wq, hadoop, mpi-queue
batch_system_type = local batch_system_type = local
......
...@@ -906,7 +906,7 @@ class Workflow(threading.Thread): ...@@ -906,7 +906,7 @@ class Workflow(threading.Thread):
if not symbols: return None if not symbols: return None
for n in log.nodes: for n in log.nodes:
if not n.symbol: continue if not n.symbol: continue
if n.symbol == component_nameid: if n.symbol.replace('"', '') == component_nameid:
status["tasks"] += 1 status["tasks"] += 1
status["time"] += n.elapsed_time status["time"] += n.elapsed_time
if n.state == Node.WAITING: if n.state == Node.WAITING:
......
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