-
Notifications
You must be signed in to change notification settings - Fork 2.8k
[bugfix] Fix flashinfer cutlass EP moe after MoE refactor #8630
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
There was a problem hiding this 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 @trevor-m, 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 provides crucial bug fixes for the FlashInfer Cutlass MoE implementation, which was experiencing zero accuracy due to recent refactoring. The changes primarily involve refining the expert mapping logic for this specific MoE type and introducing a compatibility adjustment for expert and tensor parallelism configurations to ensure correct operation.
Highlights
- FlashInfer Cutlass MoE Fix: I've addressed a critical bug where FlashInfer Cutlass MoE was causing accuracy to drop to zero after a recent MoE refactor. This involved correcting the handling of
expert_map_gpu
for this specific MoE path, as it was found not to require mapping top-k IDs using the GPU expert map. - Expert Parallelism (EP) and Tensor Parallelism (TP) Compatibility: I've implemented a temporary measure to handle the current lack of support for hybrid EP/TP configurations with FlashInfer Cutlass MoE. When both FlashInfer Cutlass MoE and EP MoE are enabled, the expert parallel size (
ep_size
) is now automatically adjusted to match the tensor parallel size (tp_size
), with a warning logged to indicate this adjustment.
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 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 or fill out our survey 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
-
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. ↩
There was a problem hiding this 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 a bugfix for the flashinfer cutlass MoE implementation, which was causing accuracy issues after a recent refactoring. The changes are well-targeted and address two specific issues:
- In
python/sglang/srt/layers/moe/fused_moe_triton/layer.py
, the code now correctly avoids mappingtopkid
IDs on the GPU when using the flashinfer cutlass MoE path, which is an unnecessary and incorrect operation for this specific kernel. - In
python/sglang/srt/server_args.py
, a check is added to enforce that the expert parallelism size (ep_size
) is equal to the tensor parallelism size (tp_size
) when flashinfer cutlass MoE is enabled. This prevents an unsupported hybrid EP/TP configuration.
The fixes appear correct and are consistent with the existing codebase. I have one suggestion to improve the clarity of a warning message for the user.
self.ep_size = self.tp_size | ||
logger.warning( | ||
f"Flashinfer cutlass MoE and EP MoE are enabled. The expert parallel size is adjusted to be the same as the tensor parallel size[{self.tp_size}]." | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The warning message informs the user about the automatic adjustment. It could be more informative by explaining why the adjustment is necessary. The reason, as mentioned in the PR description, is that hybrid EP/TP is not supported for this path. Adding this context will help users understand the constraint better.
logger.warning(
f"Flashinfer cutlass MoE and EP MoE are enabled. Forcing ep_size=tp_size ({self.tp_size}) because hybrid EP/TP is not supported for this path."
)
Motivation
Accuracy went to 0 for flashinfer cutlass MoE after recent MoE refactor and improvements.
Modifications
Accuracy Test
Benchmark & Profiling
Checklist