Skip to content

Commit f90a375

Browse files
khluuEC2 Default User
andauthored
[ci] Add logic to change model to S3 path only when S3 CI env var is on (#13727)
Signed-off-by: <> Co-authored-by: EC2 Default User <[email protected]>
1 parent e7ef74e commit f90a375

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tests/metrics/test_metrics.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import ray
88
from prometheus_client import REGISTRY
99

10+
import vllm.envs as envs
1011
from vllm import EngineArgs, LLMEngine
1112
from vllm.distributed import cleanup_dist_env_and_memory
1213
from vllm.engine.arg_utils import AsyncEngineArgs
@@ -141,8 +142,10 @@ def test_metric_set_tag_model_name(vllm_runner, model: str, dtype: str,
141142
stat_logger = vllm_model.model.llm_engine.stat_loggers['prometheus']
142143
metrics_tag_content = stat_logger.labels["model_name"]
143144

145+
if envs.VLLM_CI_USE_S3:
146+
model = f"{MODEL_WEIGHTS_S3_BUCKET}/{model}"
144147
if served_model_name is None or served_model_name == []:
145-
assert metrics_tag_content == f"{MODEL_WEIGHTS_S3_BUCKET}/{model}", (
148+
assert metrics_tag_content == model, (
146149
f"Metrics tag model_name is wrong! expect: {model!r}\n"
147150
f"actual: {metrics_tag_content!r}")
148151
else:
@@ -215,8 +218,9 @@ def test_engine_log_metrics_regression(
215218
while engine.has_unfinished_requests():
216219
engine.step()
217220

218-
assert_metrics(f"{MODEL_WEIGHTS_S3_BUCKET}/{model}", engine,
219-
disable_log_stats, len(example_prompts))
221+
if envs.VLLM_CI_USE_S3:
222+
model = f"{MODEL_WEIGHTS_S3_BUCKET}/{model}"
223+
assert_metrics(model, engine, disable_log_stats, len(example_prompts))
220224

221225

222226
@pytest.mark.parametrize("model", MODELS)

0 commit comments

Comments
 (0)