From 8730469cfaf7f0075a86de9d9e756dd1599dd041 Mon Sep 17 00:00:00 2001 From: Woosuk Kwon Date: Wed, 12 Mar 2025 18:23:39 -0700 Subject: [PATCH] mv to interface Signed-off-by: Woosuk Kwon --- vllm/v1/core/sched/interface.py | 6 ++---- vllm/v1/core/sched/scheduler.py | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/vllm/v1/core/sched/interface.py b/vllm/v1/core/sched/interface.py index dfefff7534e20..f42d546ba29b0 100644 --- a/vllm/v1/core/sched/interface.py +++ b/vllm/v1/core/sched/interface.py @@ -41,19 +41,17 @@ class SchedulerInterface(ABC): def get_num_unfinished_requests(self) -> int: raise NotImplementedError - @abstractmethod def has_unfinished_requests(self) -> bool: - raise NotImplementedError + return self.get_num_unfinished_requests() > 0 @abstractmethod def has_finished_requests(self) -> bool: raise NotImplementedError - @abstractmethod def has_requests(self) -> bool: """Returns True if there are unfinished requests, or finished requests not yet returned in SchedulerOutputs.""" - raise NotImplementedError + return self.has_unfinished_requests() or self.has_finished_requests() @abstractmethod def get_num_unscheduled_requests(self) -> int: diff --git a/vllm/v1/core/sched/scheduler.py b/vllm/v1/core/sched/scheduler.py index 915dd21c9b49c..30e26f402d639 100644 --- a/vllm/v1/core/sched/scheduler.py +++ b/vllm/v1/core/sched/scheduler.py @@ -695,17 +695,9 @@ class Scheduler(SchedulerInterface): def get_num_unfinished_requests(self) -> int: return len(self.waiting) + len(self.running) - def has_unfinished_requests(self) -> bool: - return self.get_num_unfinished_requests() > 0 - def has_finished_requests(self) -> bool: return len(self.finished_req_ids) > 0 - def has_requests(self) -> bool: - """Returns True if there are unfinished requests, or finished requests - not yet returned in SchedulerOutputs.""" - return self.has_unfinished_requests() or self.has_finished_requests() - def get_num_unscheduled_requests(self) -> int: """Number of requests that are not being processed by the executor.""" return self.get_num_unfinished_requests() - len(self.scheduled_req_ids)