[Test][Core] Cover aborted queue sweep through schedule
Signed-off-by: Sy03 <1370724210@qq.com>
This commit is contained in:
1 parent
c4c20fc525
commit
6e720e49e7
1 file changed
+31
@@ -18,6 +18,7 @@ import pytest
|
|||||||
from vllm.v1.core.sched.request_queue import SchedulingPolicy, create_request_queue
|
from vllm.v1.core.sched.request_queue import SchedulingPolicy, create_request_queue
|
||||||
from vllm.v1.request import RequestStatus
|
from vllm.v1.request import RequestStatus
|
||||||
|
|
||||||
|
import vllm_omni.core.sched.omni_ar_scheduler as ar_sched_mod
|
||||||
from vllm_omni.core.sched.omni_ar_scheduler import OmniARScheduler
|
from vllm_omni.core.sched.omni_ar_scheduler import OmniARScheduler
|
||||||
|
|
||||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||||
@@ -113,3 +114,33 @@ def test_sweep_leaves_live_requests_intact(policy: SchedulingPolicy) -> None:
|
|||||||
assert list(scheduler.skipped_waiting) == [blocked]
|
assert list(scheduler.skipped_waiting) == [blocked]
|
||||||
assert list(scheduler.waiting) == [live_waiting]
|
assert list(scheduler.waiting) == [live_waiting]
|
||||||
assert scheduler.running == [live_running]
|
assert scheduler.running == [live_running]
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("policy", _POLICIES)
|
||||||
|
def test_schedule_sweeps_skipped_waiting_before_upstream_selection(
|
||||||
|
monkeypatch: pytest.MonkeyPatch,
|
||||||
|
policy: SchedulingPolicy,
|
||||||
|
) -> None:
|
||||||
|
"""The public schedule path must remove aborted skipped requests first."""
|
||||||
|
aborted = _StubRequest("req-aborted", RequestStatus.FINISHED_ABORTED)
|
||||||
|
scheduler = _make_scheduler(policy, skipped_waiting=[aborted])
|
||||||
|
scheduler.chunk_transfer_adapter = None
|
||||||
|
scheduler.input_coordinator = None
|
||||||
|
scheduler.num_waiting_for_streaming_input = 0
|
||||||
|
scheduler._process_pending_omni_inputs = lambda model_mode: None
|
||||||
|
scheduler._resync_streaming_input_counter = lambda: None
|
||||||
|
scheduler._should_defer_waiting_admission = lambda: False
|
||||||
|
scheduler._restore_omni_wait_queues = lambda: None
|
||||||
|
scheduler._postprocess_omni_schedule_output = lambda *args, **kwargs: None
|
||||||
|
scheduler.get_finished_requests_needing_kv_transfer = lambda: {}
|
||||||
|
scheduler._wrap_omni_scheduler_output = lambda output, **kwargs: output
|
||||||
|
|
||||||
|
sentinel = object()
|
||||||
|
|
||||||
|
def upstream_schedule(_self, _throttle_prefills: bool = False):
|
||||||
|
assert list(scheduler.skipped_waiting) == []
|
||||||
|
return sentinel
|
||||||
|
|
||||||
|
monkeypatch.setattr(ar_sched_mod.VLLMScheduler, "schedule", upstream_schedule)
|
||||||
|
|
||||||
|
assert OmniARScheduler.schedule(scheduler) is sentinel
|
||||||
Reference in new issue
Block a user