Skip to content

Commit 0ecebf2

Browse files
committed
Almost working e2e
1 parent fc1d6df commit 0ecebf2

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

src/guidellm/benchmark/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
BenchmarkerProgressGroup,
4141
GenerativeConsoleBenchmarkerProgress,
4242
)
43+
from .scheduler_registry import scheduler_register_benchmark_objects
44+
45+
scheduler_register_benchmark_objects()
4346

4447
__all__ = [
4548
"Aggregator",
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
from guidellm.backend import (
2+
GenerationRequest,
3+
GenerationRequestTimings,
4+
GenerationResponse,
5+
)
6+
from guidellm.scheduler import ScheduledRequestInfo, SchedulerMessagingPydanticRegistry
7+
8+
__all__ = ["scheduler_register_benchmark_objects"]
9+
10+
11+
def scheduler_register_benchmark_objects():
12+
SchedulerMessagingPydanticRegistry.register("GenerationRequest")(GenerationRequest)
13+
SchedulerMessagingPydanticRegistry.register("GenerationResponse")(
14+
GenerationResponse
15+
)
16+
SchedulerMessagingPydanticRegistry.register("GenerationRequestTimings")(
17+
GenerationRequestTimings
18+
)
19+
SchedulerMessagingPydanticRegistry.register("ScheduledRequestInfo")(
20+
ScheduledRequestInfo
21+
)

src/guidellm/scheduler/scheduler.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ async def run(
129129
worker_group = WorkerProcessGroup[
130130
RequestT, MeasuredRequestTimingsT, ResponseT
131131
](
132+
requests=None,
132133
cycle_requests=local_requests,
133134
backend=backend,
134135
strategy=local_strategy,

src/guidellm/scheduler/worker_group.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,7 @@ def _locked_update(
578578
self._internal_constraints.update(add_constraints)
579579
if update_constraints:
580580
self._update_with_constraints(info)
581+
self._state.end_time = time.time()
581582
state_copy: SchedulerState = self._state.model_copy()
582583

583584
return (
@@ -588,23 +589,6 @@ def _locked_update(
588589
),
589590
)
590591

591-
def _locked_cancel_request(
592-
self, info: ScheduledRequestInfo[MeasuredRequestTimingsT]
593-
):
594-
if info.status != "queued":
595-
raise ValueError(f"Cannot cancel request in {info.status} state")
596-
597-
with self._update_lock:
598-
self._state.queued_requests -= 1
599-
self._state.processed_requests += 1
600-
self._state.cancelled_requests += 1
601-
602-
info.status = "cancelled"
603-
info.scheduler_timings.resolve_end = time.time()
604-
state_copy: SchedulerState = self._state.model_copy()
605-
606-
return state_copy
607-
608592
def _update_new_request(self):
609593
self._state.created_requests += 1
610594
self._state.queued_requests += 1

0 commit comments

Comments
 (0)