Update

wconstab · wconstab · commit 50c48ad85432 · 2024-10-31T08:37:37.000-07:00
[ghstack-poisoned]
diff --git a/torch/distributed/pipelining/schedules.py b/torch/distributed/pipelining/schedules.py
@@ -1608,11 +1608,7 @@ def _assert_unsharded(stage_idx: int):
                 stage_uses_fsdp = isinstance(stage.submod, FSDPModule)
                 # see [Note: V-schedule special case]
                 is_next_stage_on_this_rank = stage_idx + 1 in stage_index_to_stage
-<<<<<<< HEAD
                 is_prev_stage_on_this_rank = stage_idx - 1 in stage_index_to_stage
-=======
-                is_prev_stage_on_this_rank = stage_idx + 1 in stage_index_to_stage
->>>>>>> 9eb54a4094e ([Pipelining] Support V-schedules in IR and Runtime)
 
                 logger.debug(
                     "_PipelineScheduleRuntime running time_step %d, action %s",
