Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions python/sglang/multimodal_gen/test/server/test_server_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,17 @@ def run_and_collect(

def _validate_and_record(
self,
ctx: ServerContext,
case: DiffusionTestCase,
perf_record: RequestPerfRecord,
request_index: int = 1,
load_time_ms: float | None = None,
) -> None:
"""Validate metrics and record results."""
"""Validate metrics and record results.

The load duration is read off ``ctx`` rather than passed separately:
recording a result requires it, and a caller that has the server always
has the measurement.
"""
if perf_record is None:
raise PerformanceValidationError(
f"[performance] {case.id}: request performance record is missing"
Expand Down Expand Up @@ -426,7 +431,7 @@ def _validate_and_record(
)

summary = validator.collect_metrics(perf_record)
summary.load_time_ms = load_time_ms
summary.load_time_ms = ctx.load_time_ms
self._record_performance_result(case, summary, request_index)
self._print_performance_log(case, summary, scenario)

Expand Down Expand Up @@ -1727,7 +1732,7 @@ def run_case_check(name: str, fn: Callable[[], None]) -> None:
run_case_check(
"performance",
lambda: self._validate_and_record(
case, perf_record, request_index, diffusion_server.load_time_ms
diffusion_server, case, perf_record, request_index
),
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import textwrap
import time
from types import SimpleNamespace

import pytest

Expand Down Expand Up @@ -80,7 +81,7 @@ def test_e2e_only_does_not_require_stage_metrics(monkeypatch, generate_baseline)
steps=[],
total_duration_ms=2000 if generate_baseline else 1000,
)
server._validate_and_record(case, record, load_time_ms=100)
server._validate_and_record(SimpleNamespace(load_time_ms=100), case, record)
assert len(server._perf_results) == 1
assert bool(common._PENDING_BASELINE_DUMPS) == generate_baseline

Expand Down
2 changes: 1 addition & 1 deletion test/registered/amd/test_zimage_turbo.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def test_diffusion_generation(
diffusion_server, case.id, generate_fn
)

self._validate_and_record(case, perf_record)
self._validate_and_record(diffusion_server, case, perf_record)
self._test_v1_models_endpoint(diffusion_server, case)

prompt = case.sampling_params.prompt or ""
Expand Down
2 changes: 1 addition & 1 deletion test/registered/xpu/test_xpu_flux2_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def test_diffusion_generation(
diffusion_server, case.id, generate_fn
)

self._validate_and_record(case, perf_record)
self._validate_and_record(diffusion_server, case, perf_record)
self._test_v1_models_endpoint(diffusion_server, case)

prompt = case.sampling_params.prompt or ""
Expand Down
2 changes: 1 addition & 1 deletion test/registered/xpu/test_xpu_zimage_turbo.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def test_diffusion_generation(
diffusion_server, case.id, generate_fn
)

self._validate_and_record(case, perf_record)
self._validate_and_record(diffusion_server, case, perf_record)
self._test_v1_models_endpoint(diffusion_server, case)

prompt = case.sampling_params.prompt or ""
Expand Down
Loading