Commit 620555f
authored
[BugFix]: multiple config reading issues for env var and additional_config (vllm-project#10786)
### What this PR does / why we need it?
Fixes three configuration-related bugs:
1. VLLM_ASCEND_BALANCE_SCHEDULING env var not taking effect when
--additional-config is not set — the fallback in
_balance_scheduling_enabled now properly reads from ascend_config first,
then additional_config , then the env var.
2. Removed an unnecessary and (not is_draft_model) condition in
dispatch_ffn_combine_enable that caused a performance regression in
draft model scenarios.
3. mooncake_hybrid_connector.py was reading
enable_transpose_kv_cache_by_block directly from the envs module,
bypassing additional_config . Fixed to use get_ascend_config() so that
--additional-config settings take effect.
### Does this PR introduce _any_ user-facing change?
No breaking changes. Environment variables
VLLM_ASCEND_BALANCE_SCHEDULING and
VLLM_ASCEND_FUSION_OP_TRANSPOSE_KV_CACHE_BY_BLOCK now work correctly
again, while --additional-config settings continue to work as expected.
### How was this patch tested?
Pending CI verification.
- vLLM version: v0.22.1
- vLLM main:
vllm-project/vllm@967c5c3
---------
Signed-off-by: lizy124 <1950471827@qq.com>1 parent c6343b1 commit 620555f
3 files changed
Lines changed: 15 additions & 5 deletions
File tree
- vllm_ascend
- distributed/kv_transfer/kv_p2p
- patch/platform
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
256 | | - | |
| 256 | + | |
257 | 257 | | |
258 | 258 | | |
259 | 259 | | |
| |||
288 | 288 | | |
289 | 289 | | |
290 | 290 | | |
291 | | - | |
| 291 | + | |
292 | 292 | | |
293 | 293 | | |
294 | 294 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
55 | 54 | | |
56 | 55 | | |
57 | 56 | | |
| |||
724 | 723 | | |
725 | 724 | | |
726 | 725 | | |
727 | | - | |
| 726 | + | |
728 | 727 | | |
729 | 728 | | |
730 | 729 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
32 | 41 | | |
33 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
34 | 45 | | |
35 | 46 | | |
36 | 47 | | |
| |||
0 commit comments