From c55d5b122e5e816590a452bd3817d21ccdbbe279 Mon Sep 17 00:00:00 2001 From: Tyler Burt <195370667+tburt-nv@users.noreply.github.com> Date: Tue, 27 Oct 2026 12:05:52 -0700 Subject: [PATCH] revert 8f04d3a Signed-off-by: Tyler Burt <195370667+tburt-nv@users.noreply.github.com> --- requirements-dev.txt | 5 ----- .../defs/kv_cache/test_prefix_aware_scheduling.py | 12 ++++++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 42098a64b8f0..97c29cd430e6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -20,11 +20,6 @@ distro==1.9.0 pyyaml>=6.0.1,<6.0.3 requests>=2.32.4,<3 boto3 -# Prefix-scheduling integration tests require this exact benchmark revision. -# Owner: Simeng Liu (@SimengLiu-nv); route installation and test failures caused -# by LMBenchmark to him. Keep this revision pinned; update only when it causes -# failures, rather than tracking upstream releases on a schedule. -benchmark @ git+https://github.com/LMCache/LMBenchmark.git@c1e05a708a5a1fd04a9ec09d215edbdcccdf92cb einops # Reference implementation for KDA kernel parity tests. flash-linear-attention==0.5.2 diff --git a/tests/integration/defs/kv_cache/test_prefix_aware_scheduling.py b/tests/integration/defs/kv_cache/test_prefix_aware_scheduling.py index 9235173ffac2..744882271f5e 100644 --- a/tests/integration/defs/kv_cache/test_prefix_aware_scheduling.py +++ b/tests/integration/defs/kv_cache/test_prefix_aware_scheduling.py @@ -59,6 +59,9 @@ LMBENCHMARK_SCRIPT = "" _LMBENCHMARK_PACKAGE = "benchmark" _LMBENCHMARK_SCRIPT_IN_PACKAGE = "synthetic-multi-round-qa/multi-round-qa.py" +_LMBENCHMARK_INSTALL_SPEC = ( + f"{_LMBENCHMARK_PACKAGE} @ git+https://github.com/LMCache/LMBenchmark.git@{LMBENCHMARK_SHA}" +) CsvMetrics: TypeAlias = dict[str, int | float] _SERVER_HOST = "0.0.0.0" _SERVER_START_MAX_ATTEMPTS = 5 @@ -993,7 +996,7 @@ def _resolve_lmbenchmark_install(llm_venv: PythonVenvRunnerImpl) -> str: dist = importlib.metadata.distribution(package) except importlib.metadata.PackageNotFoundError: raise SystemExit( - "LMBenchmark package is not installed. Install requirements-dev.txt before running tests. " + "LMBenchmark package is not installed after fixture setup. " f"Expected {{script_in_package}}." ) @@ -1022,9 +1025,10 @@ def _resolve_lmbenchmark_install(llm_venv: PythonVenvRunnerImpl) -> str: @pytest.fixture(scope="module") def ensure_lmbenchmark(llm_venv: PythonVenvRunnerImpl) -> PythonVenvRunnerImpl: - """Verify and resolve the preinstalled LMBenchmark script used by this module.""" + """Install and resolve the pinned LMBenchmark script used by this module.""" global LMBENCHMARK_SCRIPT + llm_venv.run_cmd(["-m", "pip", "install", _LMBENCHMARK_INSTALL_SPEC], timeout=600) LMBENCHMARK_SCRIPT = _resolve_lmbenchmark_install(llm_venv) return llm_venv @@ -1163,8 +1167,8 @@ def test_multi_round_qa_shared_prefix( * the CSV contains no NaN ttft values * the server log is free of error patterns - This is a correctness stress test; request latency is reported but is - not a pass/fail threshold. + NOTE: This test is intended for post-merge / nightly CI due to its + ~10 min runtime per config. """ config_path = _write_config(tmp_path, sched_cfg) server_log_base = str(tmp_path / "server.log")