Skip to content

Support Llama 4 for fused_marlin_moe #20457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

mgoin
Copy link
Member

@mgoin mgoin commented Jul 3, 2025

Purpose

Implements apply_router_weight_on_input for the fused_marlin_moe implementation in order to more performantly support Llama 4 INT4A16 and to correctly support NVFP4A16

Test Plan

Model evals

Test Result

NVFP4A16

# Before (ignoring check for apply_router_weight_on_input)
vllm (pretrained=Llama-4-Scout-17B-16E-NVFP4,max_model_len=4096,tensor_parallel_size=2,trust_remote_code=True), gen_kwargs: (None), limit: None, num_fewshot: 5, batch_size: auto
|Tasks|Version|     Filter     |n-shot|  Metric   |   |Value|   |Stderr|
|-----|------:|----------------|-----:|-----------|---|----:|---|-----:|
|gsm8k|      3|flexible-extract|     5|exact_match|↑  |    0|±  |     0|
|     |       |strict-match    |     5|exact_match|↑  |    0|±  |     0|

# After
vllm (pretrained=Llama-4-Scout-17B-16E-NVFP4,max_model_len=4096,tensor_parallel_size=2,trust_remote_code=True), gen_kwargs: (None), limit: None, num_fewshot: 5, batch_size: auto
|Tasks|Version|     Filter     |n-shot|  Metric   |   |Value |   |Stderr|
|-----|------:|----------------|-----:|-----------|---|-----:|---|-----:|
|gsm8k|      3|flexible-extract|     5|exact_match|↑  |0.8082|±  |0.0108|
|     |       |strict-match    |     5|exact_match|↑  |0.8074|±  |0.0109|

Copy link

github-actions bot commented Jul 3, 2025

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @mgoin, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces support for the apply_router_weight_on_input parameter within the fused_marlin_moe implementation. This change is crucial for more performant and correct handling of Llama 4 INT4A16 and NVFP4A16 models, by enabling a specific weight application logic that was previously unsupported, as demonstrated by significant improvements in model evaluation results.

Highlights

  • Core Functionality Enablement: The fused_marlin_moe function now accepts an apply_router_weight_on_input boolean parameter, which dynamically controls the mul_topk_weights argument in internal operations. This enables specific weight application logic required for certain model configurations.
  • Removal of Restrictions: Previous NotImplementedError and assert statements that explicitly disallowed apply_router_weight_on_input for Marlin MoE across various quantization methods (AWQ, Compressed Tensors, FP8, GPTQ, ModelOpt) have been removed, unblocking this functionality.
  • Integration Across Quantization Layers: The new apply_router_weight_on_input parameter is now correctly propagated and passed down to the fused_marlin_moe calls within the AWQMarlinMoE, CompressedTensorsMoE, FP8MoE, GPTQMarlinMoE, and ModelOptMoE quantization methods, ensuring consistent behavior.
  • Marlin Utility Update: The check_moe_marlin_supports_layer utility function has been updated to no longer disallow apply_router_weight_on_input for Marlin MoE layers, reflecting the newly added support.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@mergify mergify bot added the llama Related to Llama models label Jul 3, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces support for applying router weights on the input for fused_marlin_moe, a feature required for Llama 4 models. The implementation adds an apply_router_weight_on_input flag to fused_marlin_moe and its callers across various quantization methods.

The core logic correctly uses this flag to toggle where the router weights are applied—either in the first or second GEMM of the MoE layer—ensuring they are applied exactly once. This change is consistently propagated through the codebase, and backward compatibility is maintained by defaulting the new flag to False.

The code is clean, and the changes are well-contained. The provided test results, showing a significant improvement for NVFP4A16 models, strongly support the correctness of this implementation. Overall, this is a solid contribution.

.
Signed-off-by: mgoin <[email protected]>
Copy link
Collaborator

@tlrmchlsmth tlrmchlsmth left a comment

Choose a reason for hiding this comment

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

Nice, thanks!

@DarkLight1337 DarkLight1337 enabled auto-merge (squash) July 4, 2025 02:52
@github-actions github-actions bot added the ready ONLY add when PR is ready to merge/full CI is needed label Jul 4, 2025
@DarkLight1337 DarkLight1337 merged commit 0e3fe89 into vllm-project:main Jul 4, 2025
82 checks passed
sfeng33 pushed a commit to sfeng33/vllm that referenced this pull request Jul 6, 2025
huydhn pushed a commit to huydhn/vllm that referenced this pull request Jul 8, 2025
Chen-zexi pushed a commit to Chen-zexi/vllm that referenced this pull request Jul 13, 2025
LyrisZhong pushed a commit to LyrisZhong/vllm that referenced this pull request Jul 23, 2025
avigny pushed a commit to avigny/vllm that referenced this pull request Jul 31, 2025
Pradyun92 pushed a commit to Pradyun92/vllm that referenced this pull request Aug 6, 2025
npanpaliya pushed a commit to odh-on-pz/vllm-upstream that referenced this pull request Aug 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
llama Related to Llama models ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants