Skip to content

Commit 67050e7

Browse files
authored
Merge pull request #96 from lsst/tickets/DM-52585
DM-52585:set task dependency
2 parents a352d69 + 510c54e commit 67050e7

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

doc/changes/DM-52585.feature.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add parts to set task dependency

python/lsst/ctrl/bps/panda/utils.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,7 @@ def add_idds_work(config, generic_workflow, idds_workflow):
723723
remote_filename=remote_archive_filename,
724724
qnode_map_filename=qnode_map_filename,
725725
)
726+
work.dependency_tasks = []
726727
name_works[work.task_name] = work
727728
files_to_pre_stage.update(files)
728729
idds_workflow.add_work(work)
@@ -751,12 +752,15 @@ def add_idds_work(config, generic_workflow, idds_workflow):
751752
else:
752753
inputname = job_to_pseudo_filename[parent_job_name]
753754

755+
parent_task_name = job_to_task[parent_job_name]
754756
deps.append(
755757
{
756-
"task": job_to_task[parent_job_name],
758+
"task": parent_task_name,
757759
"inputname": inputname,
758760
}
759761
)
762+
if parent_task_name not in work.dependency_tasks:
763+
work.dependency_tasks.append(parent_task_name)
760764
if not missing_deps:
761765
j_name = job_to_pseudo_filename[gwjob.name]
762766
f_name = f"{job_label}:orderIdMap_{order_id}" if enable_job_name_map else j_name
@@ -802,12 +806,15 @@ def add_idds_work(config, generic_workflow, idds_workflow):
802806
else:
803807
inputname = job_to_pseudo_filename[parent_job_name]
804808

809+
parent_task_name = job_to_task[parent_job_name]
805810
deps.append(
806811
{
807-
"task": job_to_task[parent_job_name],
812+
"task": parent_task_name,
808813
"inputname": inputname,
809814
}
810815
)
816+
if parent_task_name not in work.dependency_tasks:
817+
work.dependency_tasks.append(parent_task_name)
811818

812819
work.dependency_map.append(
813820
{

0 commit comments

Comments
 (0)