Skip to content

Commit d1f7392

Browse files
authored
[ROCm][CI] Fix v1/logits_processors failure on ROCm (#29927)
Signed-off-by: Micah Williamson <micah.williamson@amd.com>
1 parent 9ae3c55 commit d1f7392

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

tests/v1/logits_processors/test_custom_offline.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
33
import random
4-
import sys
54
from typing import Any
65

76
import pytest
@@ -10,15 +9,13 @@
109
from tests.v1.logits_processors.utils import (
1110
DUMMY_LOGITPROC_ARG,
1211
DUMMY_LOGITPROC_FQCN,
13-
DUMMY_LOGITPROC_MODULE,
1412
MAX_TOKENS,
1513
MODEL_NAME,
1614
POOLING_MODEL_NAME,
1715
TEMP_GREEDY,
1816
CustomLogitprocSource,
1917
DummyLogitsProcessor,
2018
WrappedPerReqLogitsProcessor,
21-
dummy_module,
2219
prompts,
2320
)
2421
from tests.v1.logits_processors.utils import entry_points as fake_entry_points
@@ -162,8 +159,6 @@ def test_custom_logitsprocs(monkeypatch, logitproc_source: CustomLogitprocSource
162159
kwargs: dict[str, list[str | type[LogitsProcessor]]] = {}
163160
if logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_FQCN:
164161
# Scenario: load logitproc based on fully-qualified class name (FQCN)
165-
# Inject dummy module which defines logitproc
166-
sys.modules[DUMMY_LOGITPROC_MODULE] = dummy_module
167162
kwargs["logits_processors"] = [DUMMY_LOGITPROC_FQCN]
168163
elif logitproc_source == CustomLogitprocSource.LOGITPROC_SOURCE_CLASS:
169164
# Scenario: load logitproc from provided class object

tests/v1/logits_processors/test_custom_online.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
from tests.v1.logits_processors.utils import (
1515
DUMMY_LOGITPROC_ARG,
1616
DUMMY_LOGITPROC_FQCN,
17-
DUMMY_LOGITPROC_MODULE,
1817
MAX_TOKENS,
1918
MODEL_NAME,
2019
TEMP_GREEDY,
21-
dummy_module,
2220
prompts,
2321
)
2422
from tests.v1.logits_processors.utils import entry_points as fake_entry_points
@@ -47,20 +45,14 @@ def _server_with_logitproc_entrypoint(
4745
main.main()
4846

4947

50-
def _server_with_logitproc_module(
48+
def _server_with_logitproc_fqcn(
5149
env_dict: dict[str, str] | None,
5250
model: str,
5351
vllm_serve_args: list[str],
5452
) -> None:
5553
"""Start vLLM server, inject module with dummy logitproc"""
56-
57-
# Patch `modules` to inject dummy logitproc module
5854
from vllm.entrypoints.cli import main
5955

60-
sys.modules[DUMMY_LOGITPROC_MODULE] = dummy_module
61-
62-
# fork is required for workers to see entrypoint patch
63-
os.environ["VLLM_WORKER_MULTIPROC_METHOD"] = "fork"
6456
if env_dict is not None:
6557
os.environ.update(env_dict)
6658

@@ -99,7 +91,7 @@ def server(default_server_args, request, monkeypatch):
9991
if request.param:
10092
# Launch server, append FQCN argument, inject dummy logitproc module
10193
args = default_server_args + request.param
102-
_server_fxn = _server_with_logitproc_module
94+
_server_fxn = _server_with_logitproc_fqcn
10395
else:
10496
# Launch server, inject dummy logitproc entrypoint
10597
args = default_server_args

tests/v1/logits_processors/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
TEMP_GREEDY = 0.0
2828
MAX_TOKENS = 20
2929
DUMMY_LOGITPROC_ENTRYPOINT = "dummy_logitproc"
30-
DUMMY_LOGITPROC_MODULE = "DummyModule"
30+
DUMMY_LOGITPROC_MODULE = "tests.v1.logits_processors.utils"
3131
DUMMY_LOGITPROC_FQCN = f"{DUMMY_LOGITPROC_MODULE}:DummyLogitsProcessor"
3232

3333

0 commit comments

Comments
 (0)