Skip to content

Commit aac175d

Browse files
committed
test(speechlm2): use consistent SALM imports
Signed-off-by: Piotr Żelasko <pzelasko@nvidia.com>
1 parent 53e488b commit aac175d

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

tests/collections/speechlm2/test_vllm_plugin.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ class TestMTPPlugin:
13081308
@pytest.fixture(autouse=True)
13091309
def restore_original_override(self):
13101310
"""Keep the process-local fallback hook isolated between tests."""
1311-
import nemo.collections.speechlm2.vllm.salm as salm_module
1311+
from nemo.collections.speechlm2.vllm import salm as salm_module
13121312

13131313
original_override = salm_module._ORIGINAL_VLLM_HF_CONFIG_OVERRIDE
13141314
yield
@@ -1416,7 +1416,7 @@ def test_patched_override_is_pickleable_for_spawned_engine(self, monkeypatch):
14161416
from transformers import AutoConfig
14171417
from vllm.config.speculative import SpeculativeConfig
14181418

1419-
import nemo.collections.speechlm2.vllm.salm as salm_module
1419+
from nemo.collections.speechlm2.vllm import salm as salm_module
14201420
from nemo.collections.speechlm2.vllm.salm import register
14211421

14221422
monkeypatch.setattr(
@@ -1452,7 +1452,7 @@ def test_patched_override_lazily_captures_native_hook_in_spawn_child(self, monke
14521452
"""A fresh spawn import should delegate unrelated configs to vLLM's native hook."""
14531453
from vllm.config.speculative import SpeculativeConfig
14541454

1455-
import nemo.collections.speechlm2.vllm.salm as salm_module
1455+
from nemo.collections.speechlm2.vllm import salm as salm_module
14561456

14571457
original_calls = []
14581458

@@ -1478,7 +1478,7 @@ def test_patched_override_rejects_missing_native_hook(self, monkeypatch):
14781478
"""A corrupted install must fail clearly instead of recursing into our override."""
14791479
from vllm.config.speculative import SpeculativeConfig
14801480

1481-
import nemo.collections.speechlm2.vllm.salm as salm_module
1481+
from nemo.collections.speechlm2.vllm import salm as salm_module
14821482

14831483
monkeypatch.setattr(salm_module, "_ORIGINAL_VLLM_HF_CONFIG_OVERRIDE", None)
14841484
monkeypatch.setattr(
@@ -1556,7 +1556,7 @@ def _recording_orig(cfg):
15561556
original_calls.append(cfg)
15571557
return cfg
15581558

1559-
import nemo.collections.speechlm2.vllm.salm as salm_module
1559+
from nemo.collections.speechlm2.vllm import salm as salm_module
15601560

15611561
monkeypatch.setattr(salm_module, "_ORIGINAL_VLLM_HF_CONFIG_OVERRIDE", None)
15621562
monkeypatch.setattr(SpeculativeConfig, "hf_config_override", staticmethod(_recording_orig))
@@ -1575,7 +1575,7 @@ def test_patched_override_depth_without_enabled_flag_falls_through(self, monkeyp
15751575
from transformers import AutoConfig
15761576
from vllm.config.speculative import SpeculativeConfig
15771577

1578-
import nemo.collections.speechlm2.vllm.salm as salm_module
1578+
from nemo.collections.speechlm2.vllm import salm as salm_module
15791579
from nemo.collections.speechlm2.vllm.salm import register
15801580

15811581
monkeypatch.setattr(
@@ -1607,7 +1607,7 @@ def test_patched_override_explicitly_disabled_mtp_falls_through(self, monkeypatc
16071607
from transformers import AutoConfig
16081608
from vllm.config.speculative import SpeculativeConfig
16091609

1610-
import nemo.collections.speechlm2.vllm.salm as salm_module
1610+
from nemo.collections.speechlm2.vllm import salm as salm_module
16111611
from nemo.collections.speechlm2.vllm.salm import register
16121612

16131613
monkeypatch.setattr(
@@ -1686,7 +1686,7 @@ def test_mtp_override_reregistration_preserves_first_native_hook(self, monkeypat
16861686
from transformers import AutoConfig
16871687
from vllm.config.speculative import SpeculativeConfig
16881688

1689-
import nemo.collections.speechlm2.vllm.salm as salm_module
1689+
from nemo.collections.speechlm2.vllm import salm as salm_module
16901690
from nemo.collections.speechlm2.vllm.salm import register
16911691

16921692
monkeypatch.setattr(

0 commit comments

Comments
 (0)