Skip to content
Permalink
Browse files

Made Jobs sharable between executions

Before, running a new workflow would not use jobs from previous workflows, not
even from the same workflow version.  Now jobs exist outside workflow
executions. Combined wit using the original module signature, this makes it
work better as a cache.

core/interpreter/job.py:
  - Jobs now exist outside workflows, but workflows still reference jobs.
  - Renamed modules -> jobs

core/console_mode.py: Modified job manager method names
gui/job_monitor.py: Modified job manager method names
  • Loading branch information...
rexissimus committed May 20, 2014
1 parent 7534eba commit 28dbb06f44bc84f844c948d9bfcd443e86406741
Showing with 123 additions and 107 deletions.
  1. +3 −3 vistrails/core/console_mode.py
  2. +114 −97 vistrails/core/interpreter/job.py
  3. +6 −7 vistrails/gui/job_monitor.py
@@ -122,7 +122,7 @@ def run_and_get_results(w_list, parameters='', workflow_info=None,
jobMonitor = JobMonitor.getInstance()
current_workflow = jobMonitor.currentWorkflow()
if not current_workflow:
for job in jobMonitor._running_workflows.itervalues():
for job in jobMonitor.workflows.itervalues():
try:
job_version = int(job.version)
except ValueError:
@@ -154,12 +154,12 @@ def run_and_get_results(w_list, parameters='', workflow_info=None,
if update_vistrail:
controller.write_vistrail(locator)
result.append(run)
if current_workflow.modules:
if current_workflow.jobs:
if current_workflow.completed():
run.job = "COMPLETED"
else:
run.job = "RUNNING: %s" % current_workflow.id
for job in current_workflow.modules.itervalues():
for job in current_workflow.jobs.itervalues():
if not job.finished:
run.job += "\n %s %s %s" % (job.start, job.name, job.description())
print run.job
Oops, something went wrong.

0 comments on commit 28dbb06

Please sign in to comment.
You can’t perform that action at this time.