xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2026-05-12 11:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

linting

Browse Source 
Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com>
Signed-off-by: weichen <calvin_zhu0210@outlook.com>
This commit is contained in:
Pr0Wh1teGivee 2025-12-03 15:17:55 +08:00 committed by weichen
parent 379eabac7f
commit dd0e1224bc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vllm/v1/core/sched/policy/weighted_score_softer.py
View File

@ -4,6 +4,7 @@ import time
from functools import total_ordering from functools import total_ordering
from vllm.v1.core.sched.policy.normalized_scorer import TimeAndLengthScorer from vllm.v1.core.sched.policy.normalized_scorer import TimeAndLengthScorer
from typing import Optional, List, Any
TimeAndLengthScorer_Instance = None TimeAndLengthScorer_Instance = None
@ -23,7 +24,7 @@ class WeightedScoreSorter:
self, self,
request_length: int, request_length: int,
request_arrival_time: float, request_arrival_time: float,
request_slo_requirement: list = None, request_slo_requirement: Optional[List[Any]] = None,
): ):
self.request_length = request_length self.request_length = request_length
self.request_arrival_time = request_arrival_time self.request_arrival_time = request_arrival_time
@ -34,11 +35,14 @@ class WeightedScoreSorter:
self.__update_stats() self.__update_stats()
return self.weighted_score > other_request_weighted_score.weighted_score return self.weighted_score > other_request_weighted_score.weighted_score
def __eq__(self, other_request_weighted_score: "WeightedScoreSorter") -> bool: def __eq__(self, other_request_weighted_score: object) -> bool:
if not isinstance(other_request_weighted_score, WeightedScoreSorter):
return NotImplemented
return self.weighted_score == other_request_weighted_score.weighted_score return self.weighted_score == other_request_weighted_score.weighted_score
def __update_stats(self): def __update_stats(self):
self.wait_time = time.time() - self.request_arrival_time self.wait_time = time.time() - self.request_arrival_time
assert TimeAndLengthScorer_Instance is not None
self.weighted_score = TimeAndLengthScorer_Instance.score( self.weighted_score = TimeAndLengthScorer_Instance.score(
self.wait_time, self.request_length self.wait_time, self.request_length
) )

3
vllm/v1/core/sched/request_queue.py
View File

@ -221,6 +221,7 @@ class SJFRequestQueue(RequestQueue):
def add_request(self, request: Request) -> None: def add_request(self, request: Request) -> None:
"""Add a request to the queue according to SJF policy.""" """Add a request to the queue according to SJF policy."""
assert request.prompt_token_ids is not None, "prompt_token_ids cannot be None for SJF scheduling."
heapq.heappush( heapq.heappush(
self._heap, self._heap,
( (
@ -283,7 +284,7 @@ class SJFRequestQueue(RequestQueue):
"""Iterate over the queue according to SJF policy.""" """Iterate over the queue according to SJF policy."""
heap_copy = self._heap[:] heap_copy = self._heap[:]
while heap_copy: while heap_copy:
_, _, request = heapq.heappop(heap_copy) _, request = heapq.heappop(heap_copy)
yield request yield request
def __reversed__(self) -> Iterator[Request]: def __reversed__(self) -> Iterator[Request]: