EngineX-Hygon/sglang
5
0
Fork 0
Code Issues Pull Requests Actions 7 Projects Releases Wiki Activity

Fix 7285 Merge Conflicts (#7403)

Browse Source
This commit is contained in:
Cheng Wan
2025-06-20 16:02:50 -07:00
committed by GitHub
parent 256801e973
commit 5041df2d01
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/sglang/srt/managers/scheduler.py
View File

@@ -1438,7 +1438,7 @@ class Scheduler(
if need_dp_attn_preparation and not self.spec_algorithm.is_none(): if need_dp_attn_preparation and not self.spec_algorithm.is_none():
# In speculative decoding, prefill batches and decode batches cannot be processed in the same DP attention group. # In speculative decoding, prefill batches and decode batches cannot be processed in the same DP attention group.
# We prepare idle batches in advance to skip preparing decode batches when there are prefill batches in the group. # We prepare idle batches in advance to skip preparing decode batches when there are prefill batches in the group.
new_batch, _ = self.prepare_dp_attn_batch(new_batch) new_batch, _ = self.prepare_mlp_sync_batch(new_batch)
need_dp_attn_preparation = new_batch is None need_dp_attn_preparation = new_batch is None
if new_batch is not None: if new_batch is not None:
@@ -1454,7 +1454,7 @@ class Scheduler(
# Handle DP attention # Handle DP attention
if need_dp_attn_preparation: if need_dp_attn_preparation:
ret, _ = self.prepare_dp_attn_batch(ret) ret, _ = self.prepare_mlp_sync_batch(ret)
return ret return ret