Commit 853963c6 authored by aknecht2's avatar aknecht2
Browse files

Fixed some minor bugs in workflow_module. Jobs before splits were not getting loaded correctly.

parent ee8a85a3
......@@ -159,7 +159,7 @@ class WorkflowModule(object):
for item in yaml_data:
for key in item.keys():
if key in self.workflow_jobs:
return
pass
elif "[" in key and "]" in key:
val, marker, dummy = re.split("[\[\]]", key)
if marker not in self.markers:
......@@ -167,7 +167,7 @@ class WorkflowModule(object):
self.order.append(marker)
if val not in self.markers[marker]:
self.markers[marker].append(val)
self._load_markers(item[key])
self._load_markers(item[key])
return
def get_job_params(self, markers, job_name):
......@@ -407,15 +407,16 @@ class WorkflowModule(object):
for i, job_dict in enumerate(job_list):
job_name = job_dict.keys()[0]
job_info = job_dict[job_name]
for file_dict in job_info["outputs"]:
file_name = file_dict.keys()[0]
file_info = file_dict[file_name]
if file_info.get("final_result"):
final_results.append({
"job_names": [job.keys()[0] for job in job_list[:i + 1]],
"file_info": file_info,
"file_name": file_name
})
if job_info.get("outputs"):
for file_dict in job_info["outputs"]:
file_name = file_dict.keys()[0]
file_info = file_dict[file_name]
if file_info.get("final_result"):
final_results.append({
"job_names": [job.keys()[0] for job in job_list[:i + 1]],
"file_info": file_info,
"file_name": file_name
})
return final_results
def _setup_job_params(self, master_files, job_info, markers, param_type, arg_params, outputs):
......
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