-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Fuse shared experts into trtllm_gen moe (fp8) #21491
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
wenscarl
wants to merge
2
commits into
sgl-project:main
Choose a base branch
from
wenscarl:shared_exp_integration
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2630,10 +2630,14 @@ def _handle_moe_kernel_config(self): | |||||
| "compressed-tensors", | ||||||
| None, | ||||||
| ], f"Invalid quantization '{self.quantization}'. \nFlashInfer TRTLLM MOE supports only: 'modelopt_fp4', 'fp8', 'modelopt_fp8', 'modelopt_mixed', 'compressed-tensors', or bfloat16 (None)." | ||||||
| self.disable_shared_experts_fusion = True | ||||||
| logger.warning( | ||||||
| "FlashInfer TRTLLM MoE is enabled. --disable-shared-experts-fusion is automatically set." | ||||||
| ) | ||||||
| # FP8 block-scale (fp8, mxfp8) supports fused shared experts via | ||||||
| # num_fused_shared_experts in trtllm_fp8_block_scale_moe; other | ||||||
| # quant types (BF16, FP4, per-tensor FP8) do not. | ||||||
| if self.quantization not in ["fp8", "mxfp8"]: | ||||||
| self.disable_shared_experts_fusion = True | ||||||
| logger.warning( | ||||||
| "FlashInfer TRTLLM MoE is enabled. --disable-shared-experts-fusion is automatically set." | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The warning message is correct but could be more informative. It states that shared expert fusion is disabled but doesn't explain why. The code comment explains the reason well; incorporating that into the log message would improve user experience.
Suggested change
|
||||||
| ) | ||||||
|
|
||||||
| if self.moe_runner_backend == "flashinfer_trtllm_routed": | ||||||
| assert self.quantization in [ | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 reason for disabling shared expert fusion is now potentially misleading. With this change, fusion is also enabled for CUDA with the
flashinfer_trtllmbackend under expert parallelism. The message should be updated to reflect this to avoid confusion for users on other CUDA configurations.