Skip to content

Commit 2621805

Browse files
committed
fix cp config
Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>
1 parent 8042dd6 commit 2621805

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

vllm_ascend/attention/mla_v1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def __init__(self,
226226
self.block_size = vllm_config.cache_config.block_size
227227
self.max_blocks = (vllm_config.model_config.max_model_len +
228228
self.block_size - 1) // self.block_size
229-
self.chunked_prefill_enabled = scheduler_config.chunked_prefill_enabled
229+
self.chunked_prefill_enabled = scheduler_config.enable_chunked_prefill
230230

231231
self.speculative_config = vllm_config.speculative_config
232232
self.decode_threshold = 1

vllm_ascend/core/recompute_scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ def schedule(self) -> RecomputeSchedulerOutput:
456456

457457
# chunked prefill has to be enabled explicitly to allow
458458
# pooling requests to be chunked
459-
if not self.scheduler_config.chunked_prefill_enabled and \
459+
if not self.scheduler_config.enable_chunked_prefill and \
460460
num_new_tokens > token_budget:
461461
self.waiting.pop_request()
462462
skipped_waiting_requests.prepend_request(request)

vllm_ascend/core/scheduler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def __init__(
7070
self._initialize_common()
7171

7272
def schedule(self) -> SchedulerOutput:
73-
if self.scheduler_config.chunked_prefill_enabled:
73+
if self.scheduler_config.enable_chunked_prefill:
7474
return super().schedule()
7575
scheduled_new_reqs: list[Request] = []
7676
scheduled_resumed_reqs: list[Request] = []
@@ -534,7 +534,7 @@ def _check_watermark_for_prefill(self,
534534
return True
535535

536536
def _get_prompt_limit(self, request: Request) -> int:
537-
if (self.scheduler_config.chunked_prefill_enabled
537+
if (self.scheduler_config.enable_chunked_prefill
538538
and not self.scheduler_config.is_multi_step):
539539
prompt_limit = self.vllm_config.model_config.max_model_len
540540
else:

vllm_ascend/core/scheduler_dynamic_batch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def schedule(self) -> SchedulerOutput:
404404

405405
# chunked prefill has to be enabled explicitly to allow
406406
# pooling requests to be chunked
407-
if not self.scheduler_config.chunked_prefill_enabled and \
407+
if not self.scheduler_config.enable_chunked_prefill and \
408408
num_new_tokens > token_budget:
409409
self.waiting.pop_request()
410410
skipped_waiting_requests.prepend_request(request)

vllm_ascend/platform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def check_and_update_config(cls, vllm_config: VllmConfig) -> None:
332332
vllm_config.scheduler_config.scheduler_cls = (
333333
"vllm_ascend.core.scheduler_dynamic_batch.SchedulerDynamicBatch"
334334
)
335-
vllm_config.scheduler_config.chunked_prefill_enabled = True
335+
vllm_config.scheduler_config.enable_chunked_prefill = True
336336
vllm_config.scheduler_config.SLO_limits_for_dynamic_batch = ascend_config.SLO_limits_for_dynamic_batch
337337

338338
if vllm_config.kv_transfer_config is not None and \

vllm_ascend/torchair/torchair_sfa.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def __init__(self,
171171
self.block_size = vllm_config.cache_config.block_size
172172
self.max_blocks = (vllm_config.model_config.max_model_len +
173173
self.block_size - 1) // self.block_size
174-
self.chunked_prefill_enabled = scheduler_config.chunked_prefill_enabled
174+
self.chunked_prefill_enabled = scheduler_config.enable_chunked_prefill
175175
if self.chunked_prefill_enabled:
176176
self.chunked_prefill_workspace_size = min(
177177
# Max sure there is enough for 8 full length request or at least

vllm_ascend/worker/model_runner_v1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def __init__(self, vllm_config: VllmConfig, device: torch.device):
330330
# Ascend-specific configurations
331331
self.ascend_config = get_ascend_config()
332332
if self.ascend_config.ascend_scheduler_config.enabled:
333-
self.chunked_prefill_enabled = self.scheduler_config.chunked_prefill_enabled
333+
self.chunked_prefill_enabled = self.scheduler_config.enable_chunked_prefill
334334
else:
335335
self.chunked_prefill_enabled = True
336336
self.weight_prefetch_method = WeightPrefetchMethod(

0 commit comments

Comments
 (0)