Skip to content

perf(r3): expand replay routes to local layers only#1910

Open
dyurk-lila wants to merge 3 commits into
NovaSky-AI:mainfrom
dyurk-lila:upstream/r3-bounded-device-transfer
Open

perf(r3): expand replay routes to local layers only#1910
dyurk-lila wants to merge 3 commits into
NovaSky-AI:mainfrom
dyurk-lila:upstream/r3-bounded-device-transfer

Conversation

@dyurk-lila

Copy link
Copy Markdown
Contributor

Note on the diff: This PR is part of a routed-expert-replay / sampler-support series and builds on the PRs below. GitHub can't show the intermediate branches here, so the diff is cumulative on top of main — the changes new to this PR sit on top of:

Reviewing in PR order (lowest number first) shows each incremental change cleanly.

Problem

Routed-expert IDs are stored in a compact integer dtype, but the Megatron worker
previously expanded the entire global-layer tensor to int32 before replay setup.
Under pipeline parallelism, each rank consumes only its local router layers, so that
eager expansion allocates a large int32 temporary on device for layers the rank
never uses.

Implementation

  • Keep routed-expert IDs in their compact dtype through the ordinary whole-batch
    device movement (drop the eager .to(torch.int32) in the Megatron worker forward
    paths).
  • Determine the current pipeline-parallel stage's router layers and index_select
    only those layers before metadata alignment, via a new
    _get_local_router_layer_indices helper (patched layer_number when available,
    offset-based fallback otherwise).
  • Perform the single contiguous int32 conversion inside _split_replay_indices,
    immediately before installing local replay data, so only the bounded PP-local
    slice is ever materialized as int32.
  • Validate the 4D replay-indices shape up front in setup_per_microbatch_replay_forward.

This leaves Experience.to_device(), batch generation, and normal batch ownership
unchanged. Part of a small series of routed-expert replay improvements.

Testing

uv run --isolated --extra dev --extra fsdp pytest \
  tests/backends/skyrl_train/utils/test_replay_utils.py -q \
  -p no:cacheprovider --ignore=tests/backends/skyrl_train/gpu
# 13 passed

Replay tests cover packed multi-row alignment, PP-local layer selection before
layout, compact uint8/int16/int32 sources, required int32 replay data,
padding-mask alignment, and sequence-parallel mask layout. py_compile, Ruff
(0.11.9), and Black (24.10.0) all pass on the changed files.

dyurk-lila and others added 3 commits July 16, 2026 21:27
Fix routed-expert replay (R3) correctness for RL training and introduce a
shared token-metadata layout that later routed-expert and sampler-support
work builds on.

- Scope global RouterReplay state to one Megatron pipeline schedule so a
  forward-only logprob pass can no longer leak backward replay state into
  the next training schedule (clear before the schedule and in `finally`).
- Keep `rollout_expert_indices` ragged and treat its length as the
  captured-prefix length. Derive a `router_padding_mask` after left padding
  that marks alignment padding and the uncaptured trajectory suffix, and
  carry it through the training data, replay experiences, microbatch
  padding, and the Megatron model call.
- Build one `TokenMetadataLayout` per microbatch and apply it to both routes
  and the padding mask. Generic construction, alignment, next-token shifting,
  and packed-output restoration live in `skyrl/utils/token_metadata.py`.
- Pass Megatron's `padding_mask` through the model and apply a narrow
  compatibility shim so `[tokens]` masks broadcast over experts in expert-bias
  accounting.
- Slice every per-trajectory generator field generically during dynamic-sampling
  replacement and filtering so route metadata stays attached to its trajectory.

Synthetic padding rows use distinct dummy experts `[0, ..., topk - 1]`; the
mask excludes them from expert-bias accounting while preserving Megatron's
dropless `tokens * topk` dispatcher invariant.
Store routed-expert (R3) generation data as compact NumPy arrays instead
of large nested Python lists, and send it over the network base64-encoded
alongside its shape and dtype. Expert IDs are compacted to the smallest
safe uint8/int16/int32 dtype, vLLM responses and client responses use
orjson, and preprocessing accepts the decoded NumPy route arrays directly.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Under pipeline parallelism each rank replays only its local router
layers, but the Megatron worker eagerly expanded the full global-layer
routed-expert tensor to int32 before replay setup, allocating a large
device temporary for unused layers.

Keep routed-expert IDs in their compact dtype through whole-batch device
movement, index_select the current PP stage's router layers before
metadata alignment, and perform the single int32 conversion inside
_split_replay_indices so only the bounded PP-local slice is materialized
as int32. Also validate the 4D replay-indices shape up front.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Warning

Gemini encountered an error creating the review. You can try again by commenting /gemini review.

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.

1 participant