Skip to content

Commit a3d9e7c

Browse files
Nightshift Scoutclaude
andcommitted
[nightshift] zephyr: drop dead scatter_manifest_dir parameter
The coordinator-side scatter manifest was removed in #4853 but its plumbing — the `scatter_manifest_dir` parameter on `_regroup_result_refs` and the `output_stage_name` / `join_output_stage_name` locals that only existed to build that path — was left behind. Remove the unused parameter, its two call sites, and the two dead locals. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 7505fd9 commit a3d9e7c

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

lib/zephyr/src/zephyr/execution.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,6 @@ def run_pipeline(
866866

867867
# Build and submit tasks
868868
tasks = _compute_tasks_from_shards(shards, stage, aux_per_shard, stage_name=stage_label)
869-
output_stage_name = tasks[0].stage_name if tasks else stage_label
870869
logger.info("[%s] Starting stage %s with %d tasks", self._execution_id, stage_label, len(tasks))
871870
self._start_stage(stage_label, tasks, is_last_stage=(stage_idx == last_worker_stage_idx))
872871

@@ -881,7 +880,6 @@ def run_pipeline(
881880
len(shards),
882881
output_shard_count=stage.output_shards,
883882
is_scatter=stage_is_scatter,
884-
scatter_manifest_dir=f"{self._chunk_prefix}/{self._execution_id}/{output_stage_name}",
885883
)
886884

887885
# Flatten final results — each shard may involve I/O (unpickling from
@@ -923,7 +921,6 @@ def _compute_join_aux(
923921

924922
join_stage_label = f"join-right-{parent_stage_idx}-{i}-stage{stage_idx}"
925923
right_tasks = _compute_tasks_from_shards(right_refs, right_stage, stage_name=join_stage_label)
926-
join_output_stage_name = right_tasks[0].stage_name if right_tasks else join_stage_label
927924
self._start_stage(join_stage_label, right_tasks)
928925
self._wait_for_stage()
929926
raw = self._collect_results()
@@ -933,7 +930,6 @@ def _compute_join_aux(
933930
len(right_refs),
934931
output_shard_count=right_stage.output_shards,
935932
is_scatter=right_is_scatter,
936-
scatter_manifest_dir=f"{self._chunk_prefix}/{self._execution_id}/{join_output_stage_name}",
937933
)
938934

939935
if len(shard_refs) != len(right_refs):
@@ -1313,7 +1309,6 @@ def _regroup_result_refs(
13131309
input_shard_count: int,
13141310
output_shard_count: int | None = None,
13151311
is_scatter: bool = False,
1316-
scatter_manifest_dir: str = "",
13171312
) -> list[Shard]:
13181313
"""Regroup worker output refs by output shard index without loading data.
13191314

0 commit comments

Comments
 (0)