diff --git a/benchmarks/cdb_runtime.py b/benchmarks/cdb_runtime.py index 0b75e849..2250b1e4 100644 --- a/benchmarks/cdb_runtime.py +++ b/benchmarks/cdb_runtime.py @@ -28,7 +28,7 @@ def drive(engine): if batch is not None: steps.append( dict( - stage=batch.phase.value, + works=sorted(work.name.lower() for work in batch.works), effective_rows=batch.num_tokens, submitted_rows=engine.model_runner.last_submitted_size, ) diff --git a/benchmarks/preemption.py b/benchmarks/preemption.py index 9dc56360..51a8ee9f 100644 --- a/benchmarks/preemption.py +++ b/benchmarks/preemption.py @@ -98,7 +98,9 @@ def drive(engine, requests, state): next_request = next(pending, None) state["max_waiting"] = max( state["max_waiting"], - sum(request.phase.value == "waiting" for request in engine.scheduler.requests.values()), + sum( + request.status.value == "waiting" for request in engine.scheduler.requests.values() + ), ) if engine.has_unfinished_requests(): for output in engine.step(): diff --git a/docs/diagrams/README.md b/docs/diagrams/README.md index 56061270..2aa50fe0 100644 --- a/docs/diagrams/README.md +++ b/docs/diagrams/README.md @@ -34,7 +34,7 @@ do not imply that every submission executes all three operations. `scheduler-overview.svg` is the editable 1800 × 2600 source and `scheduler-overview.png` its 2× export. The vertical A–F spine shows admission, -phase queues, policy/batch selection, execution, completion tracking and progress. +WorkKey queues, policy/batch selection, execution, completion tracking and progress. Read top to bottom; one return arrow on the left leads from F to B. A includes waiting, safe preemption and restoration; KV growth pressure in C returns to the same preemption logic. C separates prefill granularity from batching and shows supported combinations. diff --git a/docs/diagrams/index.html b/docs/diagrams/index.html index 3859ae3d..62cd0f69 100644 --- a/docs/diagrams/index.html +++ b/docs/diagrams/index.html @@ -28,7 +28,7 @@ +
Complete scheduler paths: admission, WorkKey queues, policy selection, ordinary/speculative execution, pending results, PD transfer and retirement.