[Refactor] Move iteration logging to the frontend (#46647)
Signed-off-by: maxyanghu <hyoung2991@gmail.com> Co-authored-by: Roger Wang <hey@rogerw.io> Co-authored-by: Shang Wang <shangw@nvidia.com>
This commit is contained in:
co-authored by
Roger Wang
Shang Wang
parent
9d1c695be5
commit
5a65ba5f17
@@ -1,12 +1,17 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
from vllm.v1.engine import FinishReason
|
||||
from vllm.v1.core.sched.output import ScheduledEncoderInputStats, SchedulerOutput
|
||||
from vllm.v1.engine import EngineCoreOutputs, FinishReason
|
||||
from vllm.v1.metrics.stats import (
|
||||
IterationStats,
|
||||
PrefillStats,
|
||||
PromptTokenStats,
|
||||
RequestStateStats,
|
||||
SchedulerIterationDetails,
|
||||
SchedulerStats,
|
||||
)
|
||||
from vllm.v1.serial_utils import MsgpackDecoder, MsgpackEncoder
|
||||
from vllm.v1.utils import compute_iteration_details
|
||||
|
||||
|
||||
def test_iteration_stats_repr():
|
||||
@@ -14,6 +19,45 @@ def test_iteration_stats_repr():
|
||||
assert repr(iteration_stats).startswith("IterationStats(")
|
||||
|
||||
|
||||
def test_scheduler_iteration_details_serialization():
|
||||
iteration_details = SchedulerIterationDetails(
|
||||
iteration_index=1,
|
||||
num_ctx_requests=2,
|
||||
num_ctx_tokens=3,
|
||||
num_generation_requests=4,
|
||||
num_generation_tokens=5,
|
||||
elapsed_ms=6.7,
|
||||
num_encoder_inputs=2,
|
||||
num_encoder_output_tokens=392,
|
||||
)
|
||||
outputs = EngineCoreOutputs(
|
||||
scheduler_stats=SchedulerStats(
|
||||
kv_cache_usage=0.5,
|
||||
iteration_details=iteration_details,
|
||||
)
|
||||
)
|
||||
|
||||
encoded = MsgpackEncoder().encode(outputs)
|
||||
decoded = MsgpackDecoder(EngineCoreOutputs).decode(encoded)
|
||||
|
||||
assert decoded.scheduler_stats is not None
|
||||
assert decoded.scheduler_stats.kv_cache_usage == 0.5
|
||||
assert decoded.scheduler_stats.iteration_details == iteration_details
|
||||
|
||||
|
||||
def test_compute_iteration_details_includes_encoder_stats():
|
||||
scheduler_output = SchedulerOutput.make_empty()
|
||||
scheduler_output.scheduled_encoder_input_stats = ScheduledEncoderInputStats(
|
||||
num_inputs=2,
|
||||
output_tokens=392,
|
||||
)
|
||||
|
||||
iteration_details = compute_iteration_details(scheduler_output)
|
||||
|
||||
assert iteration_details.num_encoder_inputs == 2
|
||||
assert iteration_details.num_encoder_output_tokens == 392
|
||||
|
||||
|
||||
def test_prefill_kv_computed_with_cache():
|
||||
"""Test that prefill KV compute correctly excludes cached tokens."""
|
||||
iteration_stats = IterationStats()
|
||||
|
||||
Reference in New Issue
Block a user