Skip to content

[dev] fix(moe): Fix DSA spec and rope. - #3402

Merged
hxbai merged 14 commits into
NVIDIA:devfrom
yuzhongw-nvidia:yuzhongw/fix_dsa_spec_dev
Mar 6, 2026
Merged

[dev] fix(moe): Fix DSA spec and rope.#3402
hxbai merged 14 commits into
NVIDIA:devfrom
yuzhongw-nvidia:yuzhongw/fix_dsa_spec_dev

Conversation

@yuzhongw-nvidia

@yuzhongw-nvidia yuzhongw-nvidia commented Feb 13, 2026

Copy link
Copy Markdown
Contributor

What does this PR do ?

  • RoPE
    • Refactor RoPE utils by introducing an explicit mla_rotary_interleaved flag, keeping backward compatibility for the old argument, and adding a safe fallback to unfused RoPE when MLA-style interleaving conflicts with apply_rope_fusion.
    • Disable RoPE interleaving for DSA indexer following DeepSeek's implementation code.
    • Fix the PE/NoPE split-and-concat order in DSA's RoPE application path.
  • Experimental attention variant specs
    • Disable qk layernorm fusion for DSA by forcing unfused q/kv up projections, wiring explicit q/k layernorm modules for DSA indexer input, and setting fuse_input_layernorm=False in attention metainfo.
    • Fix get_experimental_attention_variant_module_spec to handle DSA dispatch.
    • Add an assertion to prevent models with experimental attention variants from going through regular GPT spec functions.
    • Fix MTP layer spec construction for experimental attention variants.
  • Functional tests
    • Add a lightweight functional test case for DSA (gpt3_mcore_te_tp2_pp2_dsa) and register it in H100 recipe scopes (including slim CI scope).
  • Unit tests
    • Add unit tests for the RoPE refactor, including MLA interleaving behavior and fusion-conflict warning/fallback coverage.
    • Add comprehensive unit tests for experimental attention variant specs, covering DSA spec wiring, qk layernorm behavior, variant dispatch, attention/MoE pattern handling, and pipeline/vPP layer slicing.

PR for main: #3026, #3403

⚠️ For major changes (either in lines of code or in its impact), please make sure to first share a design doc with the team. If you're unsure what's the best way to do so, contact the @mcore-oncall.

Contribution process

flowchart LR
    A[Pre-checks] --> B[PR Tests]
    subgraph Code Review/Approval
        C1[Expert Review] --> C2[Final Review]
    end
    B --> C1
    C2 --> D[Merge]
Loading

Pre-checks

  • I want this PR in a versioned release and have added the appropriate Milestone (e.g., Core 0.8)
  • I have added relevant unit tests
  • I have added relevant functional tests
  • I have added proper typing to my code Typing guidelines
  • I have added relevant documentation
  • I have run the autoformatter.sh on my PR

Code review

The following process is enforced via the CODEOWNERS file for changes into megatron/core. For changes outside of megatron/core, it is up to the PR author whether or not to tag the Final Reviewer team.

For MRs into `main` branch

Feel free to message or comment the @mcore-oncall to help accelerate your merge into main. The less complex your PR is, the faster it will be approved and merged!

(Step 1): Add PR label Expert Review

(Step 2): Collect the expert reviewers reviews

  1. Attach the Expert Review label when your PR is ready for review.
  2. GitHub auto-assigns expert reviewers based on your changes. They will get notified and pick up your PR soon.

⚠️ Only proceed to the next step once all reviewers have approved, merge-conflict are resolved and the CI is passing.
Final Review might get declined if these requirements are not fulfilled.

(Step 3): Final Review

  1. Add Final Review label
  2. GitHub auto-assigns final reviewers based on your changes. They will get notified and pick up your PR soon.

(Optional Step 4): Cherry-pick into release branch

If this PR also needs to be merged into core_r* release branches, after this PR has been merged, select Cherry-pick to open a new PR into the release branch.

For MRs into `dev` branch The proposed review process for `dev` branch is under active discussion.

MRs are mergable after one approval by either eharper@nvidia.com or zijiey@nvidia.com.

Merging your PR

Any member of core-adlr and core-nemo will be able to merge your PR.

@yuzhongw-nvidia
yuzhongw-nvidia requested review from a team as code owners February 13, 2026 08:05
@copy-pr-bot

copy-pr-bot Bot commented Feb 13, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test 96495c5

@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test 19c5f45

),
)

# Adjust for RMS norm.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you leave a comment on why layernorm_linear cannot be used here? Thanks.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I add some comments below. Does it look good?

@yanring yanring added the Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review. label Feb 24, 2026
@yuzhongw-nvidia
yuzhongw-nvidia force-pushed the yuzhongw/fix_dsa_spec_dev branch from 19c5f45 to be5648f Compare February 25, 2026 06:51
@yuzhongw-nvidia
yuzhongw-nvidia requested a review from a team as a code owner February 25, 2026 06:51
@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test be5648f

@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test 35d6110

@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test f935a3b

@yuzhongw-nvidia
yuzhongw-nvidia force-pushed the yuzhongw/fix_dsa_spec_dev branch from 7324f19 to 311b567 Compare March 5, 2026 09:29
@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test 311b567

@kunlunl

kunlunl commented Mar 6, 2026

Copy link
Copy Markdown
Contributor

/ok to test 3307414

@yanring
yanring added this pull request to the merge queue Mar 6, 2026
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor

🔄 Merge queue validation started!

You can track the progress here: https://github.com/NVIDIA/Megatron-LM/actions/runs/22753432406

@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 6, 2026
@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test f362a99

@yuzhongw-nvidia

Copy link
Copy Markdown
Contributor Author

/ok to test 484fd1a

@hxbai
hxbai added this pull request to the merge queue Mar 6, 2026
@svcnvidia-nemo-ci

Copy link
Copy Markdown
Contributor

🔄 Merge queue validation started!

You can track the progress here: https://github.com/NVIDIA/Megatron-LM/actions/runs/22763776708

Merged via the queue into NVIDIA:dev with commit 3d097e5 Mar 6, 2026
48 of 49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Expert Review [deprecated] Apply this label to indicate that your PR is ready for expert review.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants