-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Support layerwise rebalancing experts #6851
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.
Hello @fzyzcjy, 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!
Summary of Changes
Hello! I am gemini-code-assist, an experienced software engineer here to provide a summary of this pull request. This PR introduces support for layerwise rebalancing of experts within the Expert Parallel Load Balancing (EPLB) system. Previously, rebalancing would update the expert locations for all layers simultaneously. With this change, rebalancing can now be performed incrementally, updating only a subset of layers per rebalance iteration, controlled by a new configuration option. This is managed through a generator-based approach in the EPLBManager
and requires modifications to the expert location update logic to handle updates for specific layers. New tests have been added to verify this layerwise update behavior.
Highlights
- Layerwise Expert Rebalancing: The core change is enabling the EPLB system to rebalance experts layer by layer, rather than all layers at once. This is controlled by a new argument
--eplb-rebalance-layers-per-chunk
. - Generator-based Rebalancing Flow: The
EPLBManager
now uses a generator (_entrypoint
) to manage the rebalancing process. It yields for a configured number of forward passes (eplb_rebalance_num_iterations
) and then yields from therebalance
method, which itself yields between processing chunks of layers if layerwise rebalancing is enabled. - Selective Expert Location Updates: The
ExpertLocationMetadata
andExpertLocationUpdater
classes have been modified to accept a list of layer IDs (update_layer_ids
) and apply updates only to the specified layers. A CPU copy of the physical-to-logical map is added to facilitate this. - New Configuration Option: A new command-line argument
--eplb-rebalance-layers-per-chunk
is added toServerArgs
to control how many layers are rebalanced in each step of the layerwise update. - Updated Tests: The existing EPLB tests are refactored using a base class, and a new test case
TestDynamicEPLBMultiChunk
is added specifically to verify the functionality of rebalancing experts layer by layer by setting the chunk size to 1.
Changelog
Click here to see the changelog
- python/sglang/srt/managers/eplb_manager.py
- Added
List
import. - Stored
eplb_rebalance_layers_per_chunk
andeplb_rebalance_num_iterations
from server args. - Updated logging message to use stored
_rebalance_num_iterations
. - Replaced simple
on_forward_pass_end
logic with a generator-based_entrypoint
. - Modified
rebalance
method to optionally enable timing based on chunking. - Implemented chunking logic for updating expert locations based on
_rebalance_layers_per_chunk
. - Called
_model_runner.update_expert_location
withupdate_layer_ids
. - Added
yield
between processing layer chunks if multiple chunks exist. - Updated rebalance end logging message.
- Added
_compute_update_layer_ids_chunks
method to determine layer chunks. - Added
_chunk_list
helper function.
- Added
- python/sglang/srt/managers/expert_location.py
- Added
physical_to_logical_map_cpu
attribute toExpertLocationMetadata
. - Initialized
physical_to_logical_map_cpu
by copying the GPU tensor to CPU in_init_raw
. - Modified
update
method to acceptupdate_layer_ids
. - Included
physical_to_logical_map_cpu
in the list of fields to update. - Changed update logic to use a mask based on
update_layer_ids
to update fields selectively per layer.
- Added
- python/sglang/srt/model_executor/expert_location_updater.py
- Imported
global_server_args_dict
(though it seems unused in the diff). - Modified
update
method to acceptupdate_layer_ids
. - Passed
update_layer_ids
to_update_expert_weights
andold_expert_location_metadata.update
. - Modified
_update_expert_weights
to acceptupdate_layer_ids
. - Used the first layer ID from
update_layer_ids
to get a sample tensor forcreate_temp_buffers
. - Iterated only over
update_layer_ids
in the update loop. - Used
physical_to_logical_map_cpu
for converting to list.
- Imported
- python/sglang/srt/model_executor/model_runner.py
- Modified
update_expert_location
to acceptupdate_layer_ids
. - Passed
update_layer_ids
toself.expert_location_updater.update
. - Removed the
forward_pass_id
argument from the call toself.eplb_manager.on_forward_pass_end
.
- Modified
- python/sglang/srt/server_args.py
- Added
eplb_rebalance_layers_per_chunk
attribute toServerArgs
with a default ofNone
. - Added
--eplb-rebalance-layers-per-chunk
command-line argument.
- Added
- test/srt/test_eplb.py
- Removed unused import
ExpertDistributionStorage
. - Renamed
TestDynamicEPLB
to_BaseTestDynamicEPLB
and made it a base class. - Added
extra_args
class attribute to the base class. - Passed
*cls.extra_args
to the server arguments insetUpClass
. - Added
SGLANG_EXPERT_LOCATION_UPDATER_CANARY: "1"
to environment variables for the server process. - Added
TestDynamicEPLBSimple
inheriting from_BaseTestDynamicEPLB
. - Added
TestDynamicEPLBMultiChunk
inheriting from_BaseTestDynamicEPLB
and settingextra_args
to test layerwise rebalancing with a chunk size of 1.
- Removed unused import
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.
Layers shift and experts roam,
Rebalance finds their new home.
Chunk by chunk they settle down,
Efficiency across the town.
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 support for layer-wise rebalancing of experts in the EPLB (Expert Placement Load Balancing) manager. This is a valuable feature as it allows the rebalancing process to be spread across multiple forward passes, potentially reducing the latency impact of a full rebalance operation.
The core changes involve modifying the EPLBManager
to use generators for managing the rebalancing schedule and state, allowing it to pause and resume. The ExpertLocationMetadata
and ExpertLocationUpdater
have been updated to support partial updates based on specified layer IDs. Tests have also been added to cover this new chunked rebalancing functionality.
The implementation appears largely correct and follows the intended design. I have one main concern regarding a potential runtime error if a specific server argument is set to zero.
Summary of Findings
- Potential
ValueError
from zero chunk size: Ifeplb_rebalance_layers_per_chunk
is set to 0, the_chunk_list
helper function will receivechunk_size=0
, leading to aValueError
fromrange()
. This needs to be addressed to prevent runtime crashes. - Accessing
update_layer_ids[0]
without explicit empty check: In_update_expert_weights
,update_layer_ids[0]
is accessed to create temporary buffers. While the current calling code ineplb_manager.py
seems to preventupdate_layer_ids
from being empty in this context, adding a defensive check or ensuringcreate_temp_buffers
can handle an empty list scenario could improve robustness. - Layer-wise Rebalancing Implementation: The introduction of generator-based incremental rebalancing is a good approach to distribute the rebalancing workload over time. The changes are well-integrated across the relevant modules.
Merge Readiness
The pull request introduces a significant and useful feature for layer-wise expert rebalancing. The implementation is generally solid. However, there is one critical issue identified concerning a potential ValueError
if eplb_rebalance_layers_per_chunk
is set to zero, which must be addressed before merging. There's also a medium-severity point about robustness in expert_location_updater.py
that would be good to consider.
Once the critical issue is resolved, and the medium severity point is considered, this PR should be in a much better state for merging. As an AI assistant, I am not authorized to approve pull requests; please ensure further review and approval from team members.
chunk_size = self._rebalance_layers_per_chunk or 1000000 | ||
return list(_chunk_list(all_layer_ids, chunk_size=chunk_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 chunk_size
for _chunk_list
is determined by self._rebalance_layers_per_chunk or 1000000
. If self._server_args.eplb_rebalance_layers_per_chunk
is explicitly set to 0
(e.g., via the --eplb-rebalance-layers-per-chunk
CLI argument), chunk_size
will become 0
.
Passing chunk_size=0
to range(0, len(items), chunk_size)
in the _chunk_list
function will raise a ValueError: range() arg 3 must not be zero
.
Could we add a check to ensure eplb_rebalance_layers_per_chunk
is positive if provided, or handle the chunk_size=0
case gracefully in _chunk_list
or here to prevent this runtime error?
temp_buffers = create_temp_buffers( | ||
next(iter(routed_experts_weights_of_layer.values())) | ||
routed_experts_weights_of_layer[update_layer_ids[0]] | ||
) |
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.
Accessing update_layer_ids[0]
assumes that update_layer_ids
will never be an empty list when _update_expert_weights
is called. While current logic in eplb_manager.py
seems to prevent this by not iterating over empty update_layer_ids_chunks
, it might be safer to add a check here or ensure that _compute_update_layer_ids_chunks
never produces empty lists within its output list of lists if all_layer_ids
was non-empty.
For instance, if update_layer_ids
could somehow be empty, this would lead to an IndexError
. Could we add a guard, for example, checking if update_layer_ids
is non-empty before proceeding, or ensure that create_temp_buffers
can handle being called with an empty list if that's a valid state (though it seems sample_tensors
is expected to be non-empty by create_temp_buffers
)?
Merge branch 'sgl_20250610_sync_tag047 of git@code.alipay.com:Theta/SGLang.git into main https://code.alipay.com/Theta/SGLang/pull_requests/52 Reviewed-by: 剑川 <jianchuan.gys@antgroup.com> * [Bugfix] Fix slice operation when chunk size mismatch (sgl-project#6697) * [Bugfix] Fix ChatCompletion endpoint of mini_lb when stream is set (sgl-project#6703) * [CI] Fix setup of disaggregation with different tp (sgl-project#6706) * [PD] Remove Unnecessary Exception Handling for FastQueue.get() (sgl-project#6712) * Fuse routed_scaling_factor in DeepSeek (sgl-project#6710) * Overlap two kernels in DeepSeek with communication (sgl-project#6711) * Minor refactor two-batch overlap (sgl-project#6682) * Speed up when having padding tokens two-batch overlap (sgl-project#6668) * [Feature] Support Flashinfer fp8 blockwise GEMM kernel on Blackwell (sgl-project#6479) * Fix LoRA bench (sgl-project#6719) * temp * Fix PP for Qwen3 MoE (sgl-project#6709) * [feat] triton kernel for get_last_loc (sgl-project#6676) * [fix] more mem for draft_extend cuda_graph (sgl-project#6726) * [PD] bug fix: Update status if nixl receiver send a a dummy req. (sgl-project#6720) * Tune memory arguments on B200 (sgl-project#6718) * Add DeepSeek-R1-0528 function call chat template (sgl-project#6725) * refactor(tool call): Fix BaseFormatDetector tool_index issue and refactor `parse_streaming_increment` (sgl-project#6715) * Add draft extend CUDA graph for Triton backend (sgl-project#6705) * refactor apply_w8a8_block_fp8_linear in fp (sgl-project#6545) * [PD] Support completion endpoint (sgl-project#6729) * PD Rust LB (PO2) (sgl-project#6437) * Super tiny enable sole usage of expert distribution metrics and update doc (sgl-project#6680) * Support picking variants of EPLB algorithms (sgl-project#6728) * Support tuning DeepEP configs (sgl-project#6742) * [test] add ut and bm for get_last_loc (sgl-project#6746) * Fix mem_fraction_static for AMD CI (sgl-project#6748) * [fix][RL] Fix DeepSeekV3ForCausalLM.post_load_weights for multiple update weight (sgl-project#6265) * Improve EPLB logical to physical dispatch map (sgl-project#6727) * Update DeepSeek-R1-0528 function call chat template (sgl-project#6765) * [PD] Optimize time out logic and add env var doc for mooncake (sgl-project#6761) * Fix aiohttp 'Chunk too big' in bench_serving (sgl-project#6737) * Support sliding window in triton backend (sgl-project#6509) * Fix shared experts fusion error (sgl-project#6289) * Fix one bug in the grouped-gemm triton kernel (sgl-project#6772) * update llama4 chat template and pythonic parser (sgl-project#6679) * feat(tool call): Enhance Llama32Detector for improved JSON parsing in non-stream (sgl-project#6784) * Support token-level quantization for EP MoE (sgl-project#6782) * Temporarily lower mmlu threshold for triton sliding window backend (sgl-project#6785) * ci: relax test_function_call_required (sgl-project#6786) * Add intel_amx backend for Radix Attention for CPU (sgl-project#6408) * Fix incorrect LoRA weight loading for fused gate_up_proj (sgl-project#6734) * fix(PD-disaggregation): Can not get local ip (sgl-project#6792) * [FIX] mmmu bench serving result display error (sgl-project#6525) (sgl-project#6791) * Bump torch to 2.7.0 (sgl-project#6788) * chore: bump sgl-kernel v0.1.5 (sgl-project#6794) * Improve profiler and integrate profiler in bench_one_batch_server (sgl-project#6787) * chore: upgrade sgl-kernel v0.1.5 (sgl-project#6795) * [Minor] Always append newline after image token when parsing chat message (sgl-project#6797) * Update CI tests for Llama4 models (sgl-project#6421) * [Feat] Enable PDL automatically on Hopper architecture (sgl-project#5981) * chore: update blackwell docker (sgl-project#6800) * misc: cache is_hopper_arch (sgl-project#6799) * Remove contiguous before Flashinfer groupwise fp8 gemm (sgl-project#6804) * Correctly abort the failed grammar requests & Improve the handling of abort (sgl-project#6803) * [EP] Add cuda kernel for moe_ep_pre_reorder (sgl-project#6699) * Add draft extend CUDA graph for flashinfer backend (sgl-project#6805) * Refactor CustomOp to avoid confusing bugs (sgl-project#5382) * Tiny log prefill time (sgl-project#6780) * Tiny fix EPLB assertion about rebalancing period and recorder window size (sgl-project#6813) * Add simple utility to dump tensors for debugging (sgl-project#6815) * Fix profiles do not have consistent names (sgl-project#6811) * Speed up rebalancing when using non-static dispatch algorithms (sgl-project#6812) * [1/2] Add Kernel support for Cutlass based Fused FP4 MoE (sgl-project#6093) * [Router] Fix k8s Service Discovery (sgl-project#6766) * Add CPU optimized kernels for topk and rope fusions (sgl-project#6456) * fix new_page_count_next_decode (sgl-project#6671) * Fix wrong weight reference in dynamic EPLB (sgl-project#6818) * Minor add metrics to expert location updater (sgl-project#6816) * [Refactor] Rename `n_share_experts_fusion` as `num_fused_shared_experts` (sgl-project#6735) * [FEAT] Add transformers backend support (sgl-project#5929) * [fix] recover auto-dispatch for rmsnorm and rope (sgl-project#6745) * fix ep_moe_reorder kernel bugs (sgl-project#6858) * [Refactor] Multimodal data processing for VLM (sgl-project#6659) * Decoder-only Scoring API (sgl-project#6460) * feat: add dp-rank to KV events (sgl-project#6852) * Set `num_fused_shared_experts` as `num_shared_experts` when shared_experts fusion is not disabled (sgl-project#6736) * Fix one missing arg in DeepEP (sgl-project#6878) * Support LoRA in TestOpenAIVisionServer and fix fused kv_proj loading bug. (sgl-project#6861) * support 1 shot allreduce in 1-node and 2-node using mscclpp (sgl-project#6277) * Fix Qwen3MoE missing token padding optimization (sgl-project#6820) * Tiny update error hints (sgl-project#6846) * Support layerwise rebalancing experts (sgl-project#6851) * Tiny allow profiler API to auto create directory (sgl-project#6865) * Support Blackwell DeepEP docker images (sgl-project#6868) * [EP] Add cuda kernel for moe_ep_post_reorder (sgl-project#6837) * [theta]merge 0605 * oai: fix openAI client error with single request via batch api (sgl-project#6170) * [PD] Fix potential perf spike caused by tracker gc and optimize doc (sgl-project#6764) * Use deepgemm instead of triton for fused_qkv_a_proj_with_mqa (sgl-project#6890) * [CUTLASS-FP4-MOE] Introduce CutlassMoEParams class for easy initialization of Cutlass Grouped Gems Metadata (sgl-project#6887) * bugfix(OAI): Fix image_data processing for jinja chat templates (sgl-project#6877) * [CPU] enable CI for PRs, add Dockerfile and auto build task (sgl-project#6458) * AITER backend extension and workload optimizations (sgl-project#6838) * [theta]merge * [theta]merge * [Feature] Support Flashinfer fmha on Blackwell (sgl-project#6930) * Fix a bug in abort & Improve docstrings for abort (sgl-project#6931) * Tiny support customize DeepEP max dispatch tokens per rank (sgl-project#6934) * Sync the changes on cuda graph runners (sgl-project#6932) * [PD] Optimize transfer queue forward logic for dummy rank (sgl-project#6922) * [Refactor] image data process in bench_serving (sgl-project#6879) * [fix] logical_to_all_physical_map index 256 is out of bounds in EP parallel. (sgl-project#6767) * Add triton fused moe kernel config for E=257 on B200 (sgl-project#6939) * [sgl-kernel] update deepgemm (sgl-project#6942) * chore: bump sgl-kernel v0.1.6 (sgl-project#6943) * Minor compile fused topk (sgl-project#6944) * [Bugfix] pipeline parallelism and Eagle Qwen2 (sgl-project#6910) * Tiny re-introduce profile id logging (sgl-project#6912) * Add triton version as a fused_moe_triton config search key to avoid performace decrease in different Triton version (sgl-project#5955) * reduce torch.zeros overhead in moe align block size kernel (sgl-project#6369) * chore: upgrade sgl-kernel v0.1.6 (sgl-project#6945) * add fbgemm moe grouped gemm kernel benchmark (sgl-project#6924) * [Docker] Add docker file for SGL Router (sgl-project#6915) * Disabling mixed chunked prefill when eagle is enabled (sgl-project#6874) * Add canary for EPLB rebalancing (sgl-project#6895) * Refactor global_server_args_dict (sgl-project#6866) * Fuse routed scaling factor in topk_reduce kernel (sgl-project#6220) * Update server timeout time in AMD CI. (sgl-project#6953) * [misc] add is_cpu() (sgl-project#6950) * Add H20 fused MoE kernel tuning configs for DeepSeek-R1/V3 (sgl-project#6885) * Add a CUDA kernel for fusing mapping and weighted sum for MoE. (sgl-project#6916) * chore: bump sgl-kernel v0.1.6.post1 (sgl-project#6955) * chore: upgrade sgl-kernel v0.1.6.post1 (sgl-project#6957) * [DeepseekR1-FP4] Add Support for nvidia/DeepSeekR1-FP4 model (sgl-project#6853) * Revert "Fuse routed scaling factor in topk_reduce kernel (sgl-project#6220)" (sgl-project#6968) * [AMD] Add more tests to per-commit-amd (sgl-project#6926) * chore: bump sgl-kernel v0.1.7 (sgl-project#6963) * Slightly improve the sampler to skip unnecessary steps (sgl-project#6956) * rebase h20 fused_moe config (sgl-project#6966) * Fix CI and triton moe Configs (sgl-project#6974) * Remove unnecessary kernels of num_token_non_padded (sgl-project#6965) * Extend cuda graph capture bs for B200 (sgl-project#6937) * Fuse routed scaling factor in deepseek (sgl-project#6970) * Sync cuda graph runners (sgl-project#6976) * Fix draft extend ut stability with flush cache (sgl-project#6979) * Fix triton sliding window test case (sgl-project#6981) * Fix expert distribution dumping causes OOM (sgl-project#6967) * Minor remove one kernel for DeepSeek (sgl-project#6977) * [perf][sgl-kernel] extend cutlass_mla_decode to support num_head < 128 (sgl-project#6929) * Enable more unit tests for AMD CI. (sgl-project#6983) * Use torch.compile to fuse flash attention decode metadata preparation (sgl-project#6973) * Eliminate stream sync to speed up LoRA batch init (sgl-project#6960) * support qwen3 emebedding (sgl-project#6990) * Fix torch profiler bugs for bench_offline_throughput.py (sgl-project#6557) * chore: upgrade flashinfer v0.2.6.post1 jit (sgl-project#6958) * cleanup tmp dir (sgl-project#7007) * chore: update pr test xeon (sgl-project#7008) * Fix cutlass MLA gets almost zero accuracy (sgl-project#6998) * Update amd nightly models CI. (sgl-project#6992) * feat: add direct routing strategy to DP worker (sgl-project#6884) * Fallback to lower triton version for unfound fused moe configs (sgl-project#7013) * Fix torchvision version for Blackwell (sgl-project#7015) * Simplify prepare_extend_after_decode (sgl-project#6987) * Migrate to assertEqual (sgl-project#6741) * Fix torch version in blackwell dockerfile (sgl-project#7017) * chore: update pr test xeon (sgl-project#7018) * Update default settings for blackwell (sgl-project#7023) * Support both approximate and exact expert distribution collection (sgl-project#6964) * Add decode req pool (sgl-project#6980) * [theta]merge 0610 * [theta]merge 0610 * [CI] Add CI workflow for sgl-router docker build (sgl-project#7027) * Fix fused_moe triton configs (sgl-project#7029) * CPU: map changes from developing branch in sgl-kernel (sgl-project#6833) * chore: bump v0.4.7 (sgl-project#7038) * Update README.md (sgl-project#7040)
Motivation
Modifications
Checklist