From 33e1ea4d1ac70dbbf19f0ac44a54561b1ad3e264 Mon Sep 17 00:00:00 2001 From: Li Wang Date: Tue, 22 Jul 2025 08:38:30 +0800 Subject: [PATCH] [CI] Fix broken CI (#1915) ### What this PR does / why we need it? Fix [#21227](https://github.com/vllm-project/vllm/pull/21227) to make ci happy - vLLM version: v0.9.2 - vLLM main: https://github.com/vllm-project/vllm/commit/6b46c4b653d1d730a9b75d32b59b9d60f879b9d7 --------- Signed-off-by: wangli --- vllm_ascend/worker/model_runner_v1.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/vllm_ascend/worker/model_runner_v1.py b/vllm_ascend/worker/model_runner_v1.py index 0ad4f36..a3db5fd 100644 --- a/vllm_ascend/worker/model_runner_v1.py +++ b/vllm_ascend/worker/model_runner_v1.py @@ -24,7 +24,7 @@ import types import weakref from contextlib import contextmanager, nullcontext from dataclasses import dataclass -from typing import TYPE_CHECKING, Dict, List, Optional, Union, cast, get_args +from typing import TYPE_CHECKING, Dict, List, Optional, Union, cast import numpy as np import numpy.typing as npt @@ -93,7 +93,6 @@ if vllm_version_is("0.9.2"): from vllm.model_executor.models.interfaces import has_step_pooler from vllm.v1.utils import bind_kv_cache else: - from vllm.pooling_params import PoolingTask from vllm.v1.worker.utils import bind_kv_cache if TYPE_CHECKING: @@ -408,13 +407,10 @@ class NPUModelRunner(LoRAModelRunnerMixin): generator = None if not vllm_version_is("0.9.2") and pooling_params: - assert pooling_params.task is not None, ( + assert (task := pooling_params.task) is not None, ( "You did not set `task` in the API") model = cast(VllmModelForPooling, self.model) - to_update = (model.pooler.get_pooling_updates( - pooling_params.task)) - assert to_update is not None, ( - f"{pooling_params.task=} is not supported by the model") + to_update = model.pooler.get_pooling_updates(task) to_update.apply(pooling_params) self.requests[req_id] = CachedRequestState( @@ -1772,7 +1768,6 @@ class NPUModelRunner(LoRAModelRunnerMixin): dummy_pooling_params = PoolingParams(task=dummy_task) to_update = model.pooler.get_pooling_updates(dummy_task) - assert to_update is not None to_update.apply(dummy_pooling_params) dummy_metadata = PoolingMetadata( @@ -2434,7 +2429,4 @@ class NPUModelRunner(LoRAModelRunnerMixin): if not is_pooling_model(model): return [] - return [ - task for task in get_args(PoolingTask) - if model.pooler.get_pooling_updates(task) - ] + return list(model.pooler.get_supported_tasks())