Skip to content

Use FusedMoEQuantConfig everywhere #19921

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

Draft
wants to merge 40 commits into
base: main
Choose a base branch
from

Conversation

bnellnm
Copy link
Contributor

@bnellnm bnellnm commented Jun 20, 2025

Essential Elements of an Effective PR Description Checklist

  • The purpose of the PR, such as "Fix some issue (link existing issues this PR will resolve)".
  • The test plan, such as providing test command.
  • The test results, such as pasting the results comparison before and after, or e2e results
  • (Optional) The necessary documentation update, such as updating supported_models.md and examples for a new model.

Purpose

Test Plan

Test Result

(Optional) Documentation Update

bnellnm added 30 commits June 16, 2025 17:39
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
bnellnm added 8 commits June 18, 2025 21:50
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Signed-off-by: Bill Nell <[email protected]>
Copy link

👋 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.

🚀

@mergify mergify bot added the rocm Related to AMD ROCm label Jun 20, 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.

Summary of Changes

Hello @bnellnm, 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 undertakes a significant refactoring of the Mixture of Experts (MoE) implementation to centralize and standardize how quantization configurations are handled. By introducing a dedicated FusedMoEQuantConfig class, it streamlines parameter passing across various MoE kernels and their modular components. This change enhances code maintainability, improves testability, and lays the groundwork for more robust quantization support within the MoE system.

Highlights

  • Quantization Configuration Centralization: Introduced a new FusedMoEQuantConfig class to centralize and standardize quantization parameters across all Mixture of Experts (MoE) kernels. This replaces numerous individual boolean flags (e.g., use_fp8_w8a8, per_channel_quant) with a single, structured configuration object.
  • Modular MoE Architecture Enhancement: The modular MoE kernel architecture has been significantly refactored to consistently utilize FusedMoEQuantConfig. This includes updates to FusedMoEPrepareAndFinalize and FusedMoEPermuteExpertsUnpermute base classes, and their concrete implementations (e.g., TritonExperts, DeepGemmExperts, PplxPrepareAndFinalize, DeepEPPrepareAndFinalize).
  • Improved Quantization Test Coverage: New dedicated test files (tests/kernels/moe/test_block_fp8.py and tests/kernels/moe/test_block_int8.py) have been added to thoroughly test block-wise FP8 and INT8 quantization for fused MoE operations, including integration with DeepGemm kernels.
  • Standardized MoE Test Utilities: A new utility file (tests/kernels/moe/utils.py) has been introduced, providing helper functions like make_quantized_test_activations, make_test_weights, triton_moe, and batched_moe to streamline and standardize MoE kernel testing with quantization.
  • Refactored Quantization Helpers: Core quantization helper functions, such as moe_kernel_quantize_input and native_w8a8_block_matmul, have been updated and/or moved to tests/kernels/quant_utils.py to support the new FusedMoEQuantConfig and improve code organization.
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.

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

The pull request focuses on using FusedMoEQuantConfig everywhere, which involves removing redundant parameters and ensuring consistency in quantization configurations across different MoE implementations. The changes include modifications in test files to accommodate the new configuration and ensure correct functionality with various quantization settings. The code review identified areas for improved documentation, consistency, and clarity, particularly regarding the use of environment variables and the rationale behind certain design choices.

Comment on lines +32 to +34
in_dtype: torch.dtype
quant_dtype: Optional[torch.dtype]
out_dtype: torch.dtype
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider adding docstrings to explain the purpose of each field in the BatchedMMConfig dataclass.

Comment on lines +154 to +155
"BLOCK_SIZE_K": 16 if dtype.itemsize > 1 else 32
},
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The block size is hardcoded here. Consider adding it as a parameter to the test function.

Comment on lines +33 to +35
# These sizes trigger wrong answers.
#(7232, 2048, 5120),
#(40000, 2048, 5120),
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider adding a comment to explain why these sizes trigger wrong answers.

@bnellnm bnellnm force-pushed the moe-quant-config branch from e86122b to 1b57e9d Compare June 20, 2025 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rocm Related to AMD ROCm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant