Skip to content

Commit 0647127

Browse files
committed
fix lint
Signed-off-by: wangli <wangli858794774@gmail.com>
1 parent c8c2b2f commit 0647127

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

vllm_ascend/core/schedule_config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ def __post_init__(self) -> None:
7474
if self.send_delta_data:
7575
raise NotImplementedError(
7676
"currently AscendScheduler doesn't support send_delta_data.")
77+
if getattr(self, "scheduler_delay_factor", 0) > 0:
78+
raise NotImplementedError(
79+
"currently AscendScheduler doesn't support scheduler_delay_factor."
80+
)

vllm_ascend/platform.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ def check_and_update_config(cls, vllm_config: VllmConfig) -> None:
142142
"functionality is currently suboptimal.")
143143
if not model_config.is_multimodal_model and \
144144
structured_outputs_config.backend == "auto" and \
145+
not getattr(scheduler_config, "scheduler_delay_factor", 0) > 0 and \
145146
not scheduler_config.send_delta_data and \
146147
scheduler_config.policy == "fcfs":
147148
ascend_scheduler_config.enabled = True

vllm_ascend/torchair/models/torchair_pangu_moe.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,7 @@
5757
from vllm.v1.sample.sampler import Sampler
5858

5959
from vllm_ascend.ascend_config import get_ascend_config
60-
from vllm_ascend.utils import ACL_FORMAT_FRACTAL_NZ, is_310p, vllm_version_is
61-
62-
if vllm_version_is("0.10.2"):
63-
from vllm.model_executor.layers.sampler import \
64-
SamplerOutput # type: ignore[import]
65-
else:
66-
from vllm.v1.sample.sampler import SamplerOutput
60+
from vllm_ascend.utils import ACL_FORMAT_FRACTAL_NZ, is_310p
6761

6862
_ROUTER_SCALE = None
6963

@@ -952,7 +946,7 @@ def sample(
952946
self,
953947
logits: Optional[torch.Tensor],
954948
sampling_metadata, # type: ignore
955-
) -> Optional[SamplerOutput]:
949+
):
956950
next_tokens = self.sampler(logits, sampling_metadata)
957951
return next_tokens
958952

0 commit comments

Comments
 (0)