Skip to content

fix: restore PP process group on batched pipeline P2P ops - #83

Open
Laz4rz wants to merge 33 commits into
radixark:miles-mainfrom
Laz4rz:fix/batched-p2p-pp-group
Open

fix: restore PP process group on batched pipeline P2P ops#83
Laz4rz wants to merge 33 commits into
radixark:miles-mainfrom
Laz4rz:fix/batched-p2p-pp-group

Conversation

@Laz4rz

@Laz4rz Laz4rz commented Aug 14, 2026

Copy link
Copy Markdown

Summary

_batched_p2p_ops in megatron/core/pipeline_parallel/p2p_communication.py builds its four torch.distributed.P2POp calls without the group argument. It was dropped in b4d401c (#2, "misc compatibility fixes for PyTorch and TE") with the rationale "Remove group param from P2POp calls (PyTorch new API)".

That rationale is mistaken:

  • P2POp(op, tensor, peer, group) is still valid in current PyTorch (verified on torch 2.11). peer stays a global rank; group selects the communicator. The API did not change.
  • With group omitted, every op defaults to the WORLD communicator — pipeline-parallel payload traffic (activations/grads between PP stages) loses its process-group isolation.
  • The same file never dropped it elsewhere: _communicate_shapes passes self.pp_group and _p2p_ops passes group to this day, so the batched path is internally inconsistent.

This PR restores exactly the pre-b4d401c71 form (matches NVIDIA upstream main):

# before (broken)
torch.distributed.P2POp(torch.distributed.isend, tensor_send_prev, prev_pipeline_rank)
# after (this PR)
torch.distributed.P2POp(torch.distributed.isend, tensor_send_prev, prev_pipeline_rank, group)

(same for the other three ops; 4 lines changed, nothing else from b4d401c is touched)

NPU safety

This fork is consumed by CUDA/NCCL images only — the NPU flow patches NVIDIA upstream, not this fork — so restoring group carries no HCCL compatibility risk.

Downstream note

Downstream (arcee) currently carries a runtime compat shim that monkey-patches _batched_p2p_ops to re-add the group; it self-disables once it detects this fix has landed, so no coordinated rollout is needed.

yueming-yuan and others added 30 commits February 25, 2026 19:22
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
…rk#4)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-authored-by: Yueming Yuan <yym022502@gmail.com>
…adixark#5)

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
- Detach output layer params to prevent MTP gradient flowing to output layer
- Add mtp_kwargs interface for flexible MTP label/loss_mask passing
- Roll mtp_labels and loss_mask for RL training compatibility

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Yueming Yuan <yym022502@gmail.com>
…yers (radixark#10)

- Add is_mtp flag to MoE layers and multi_token_prediction module
- Bypass routing replay for MTP layers (MTP uses fresh routing)
- Replace rdxa/dev's built-in RouterReplay with miles.utils.routing_replay:
  - moe_utils.py: use get_routing_replay_compute_topk() wrapper
  - router.py: use register_routing_replay() for initialization

Co-authored-by: Yueming Yuan <yym022502@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Yueming Yuan <yym022502@gmail.com>
After bumping Megatron (rdxa/dev), colocated IPC weight update fails with
torch.AcceleratorError: CUDA error: invalid argument during
torch.multiprocessing serialization of CUDA tensors.

Root cause: Megatron's new TMS hook (PR NVIDIA#3048) alters allocator behavior
in training flow, causing allocations via cuMemCreate/cuMemMap which are
incompatible with CUDA IPC (_share_cuda_() fails).

Fix: resolve mapping.py and dynamic_context.py conflicts to isolate
hook side effects so TMS/allocator state remains IPC-compatible during
the weight update phase.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- merge(): truncate dp_reshardable padding on optimizer/param_state path
- load_parameter_state_from_dp_reshardable: tolerate missing 'padding' key
- ShardedTensor: relax flattened_range to deprecation warning

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This PR rebases from radixark Megatron fork [miles-20260218](https://github.com/radixark/Megatron-LM/tree/miles-20260218) and resolve conflicts.

Upgrade Megatron from Dec 17 (3714d81) to Feb 13 (1dcf0da)

PR link: radixark#13

Co-authored-by: Yueming Yuan <yym022502@gmail.com>
Made-with: Cursor
…se `--disable-weight-backuper` in miles (radixark#18)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: fzyzcjy <5236035+fzyzcjy@users.noreply.github.com>
…adixark#20)

Co-authored-by: fzyzcjy <5236035+fzyzcjy@users.noreply.github.com>
Squash merge of the dense true-on-policy Megatron branch.

Co-authored-by: zju-stu-lizheng <lizheng.cs@zju.edu.cn>
Co-authored-by: zyxiyy02 <282300612+zyxiyy02@users.noreply.github.com>
Co-authored-by: Yi Zhang <1109276519@qq.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: fzyzcjy <5236035+fzyzcjy@users.noreply.github.com>
…xark#58)

Co-authored-by: Zhiyao Jiang <jessicajiang324@gmail.com>
…xark#60)

Co-authored-by: zyzshishui <82826991+zyzshishui@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: yueming-yuan <yym022502@gmail.com>
sreerohi and others added 3 commits August 5, 2026 23:33
…e host memory instead of pinned memory to avoid SegFault on ROCm (radixark#74)
The group argument was dropped from all four torch.distributed.P2POp
calls in _batched_p2p_ops in b4d401c under the rationale "Remove
group param from P2POp calls (PyTorch new API)". That rationale is
mistaken: P2POp(op, tensor, peer, group) remains valid in current
PyTorch (verified on torch 2.11) — peer stays a global rank and group
selects the communicator.

With group omitted, every op defaults to the WORLD communicator, so
pipeline-parallel payload traffic (activations/grads between PP stages)
loses its process-group isolation and is routed over the world group.

This is also inconsistent within the same file: _communicate_shapes
and _p2p_ops never dropped the group argument.

This fork is consumed by CUDA/NCCL images only (the NPU flow patches
NVIDIA upstream, not this fork), so restoring group carries no HCCL
compatibility risk.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants