Repository navigation
Support Waterfill with MegaMoE backend - #27350
Merged
Merged
Conversation
xutizhou
requested review from
BBuf,
Edwardf0t1,
Fridge003,
HaiShaw,
Ying1123,
ch-wan,
fzyzcjy,
ispobock and
merrymercy
as code owners
June 5, 2026 06:55
Contributor
|
Warning You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again! |
# Conflicts: # python/sglang/srt/layers/moe/fused_moe_triton/layer.py # python/sglang/srt/layers/moe/hash_topk.py # python/sglang/srt/layers/moe/mega_moe.py # python/sglang/srt/layers/moe/topk.py # python/sglang/srt/layers/moe/utils.py # python/sglang/srt/layers/quantization/fp8.py # python/sglang/srt/model_executor/model_runner.py # python/sglang/srt/models/deepseek_v2.py # python/sglang/srt/models/deepseek_v4.py # test/registered/moe/test_hash_topk.py # test/registered/unit/eplb/test_deepep_waterfill_eplb.py # test/registered/unit/models/test_deepseek_v4_shared_expert_fusion.py
ch-wan
approved these changes
Jul 10, 2026
# Conflicts: # python/sglang/srt/layers/moe/hash_topk.py # python/sglang/srt/layers/moe/topk.py # python/sglang/srt/server_args.py
BBuf
added a commit
to BBuf/sglang
that referenced
this pull request
Jul 13, 2026
… kernel extraction (moe) main renamed deepep_waterfill.py -> waterfill.py and DeepEPWaterfillBalancer -> WaterfillBalancer (cosmetic, no kernel-logic change); sgl-project#30786 extracted the triton kernels to kernels/ops/moe/deepep_waterfill_kernels.py. Resolution keeps the extraction and adopts main's naming, so waterfill.py imports the kernels and exposes WaterfillBalancer (as model_runner now expects). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fzyzcjy
added a commit
that referenced
this pull request
Jul 13, 2026
…): black-collapse two now-shorter Waterfill statements After renaming the DeepEP-waterfill strings to the shorter upstream #27350 names, two statements in prepare_moe_topk (raise ValueError / log_info_on_rank0) fit on one line, so black collapses them. CI Lint (black-jupyter) flagged it; apply the reformat.
fzyzcjy
added a commit
that referenced
this pull request
Jul 14, 2026
…vable): black-collapse two now-shorter Waterfill statements After the upstream #27350 Waterfill rename shortened two strings in prepare_moe_topk (the ValueError message and the log_info_on_rank0 call), they fit on one line, so black collapses them. Applied as a postpare after the cut+paste move so the move itself stays byte-faithful.
fzyzcjy
added a commit
that referenced
this pull request
Jul 14, 2026
…vable): black-collapse two now-shorter Waterfill statements After the upstream #27350 Waterfill rename shortened two strings in prepare_moe_topk (the ValueError message and the log_info_on_rank0 call), they fit on one line, so black collapses them. Applied as a postpare after the cut+paste move so the move itself stays byte-faithful.
Chronostasys
pushed a commit
to MindLab-Research/sglang
that referenced
this pull request
Aug 24, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Dependency
Depends on #27349, which adds the MegaMoE/shared expert fusion loading compatibility needed by the current DeepSeek-V4-Flash FP4 test path. This branch is stacked on top of
xutizhou:fix/megamoe-shared-fusion-quant; after #27349 lands, this PR should be rebased onmainso its diff only shows the Waterfill+MegaMoE changes.Testing
CI States
Latest PR Test (Base): ❌ Run #29149824508
Latest PR Test (Extra): ❌ Run #29149824332