Skip to content

Commit 7717a27

Browse files
authored
[UT][fix] Add missing get_ascend_config mock to NPUWorker initialization tests (vllm-project#3729)
### What this PR does / why we need it? Enable the unit tests that vllm-project#3612 skipped. ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? Unit tests. - vLLM main: vllm-project/vllm@17c540a Signed-off-by: gcanlin <canlinguosdu@gmail.com> Signed-off-by: luolun <luolun1995@cmbchina.com>
1 parent 178476a commit 7717a27

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.github/workflows/vllm_ascend_test.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ jobs:
120120
run: |
121121
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/x86_64-linux/devlib
122122
pytest -sv --cov --cov-report=xml:unittests-coverage.xml tests/ut \
123-
--ignore tests/ut/torchair/test_torchair_mla.py \
124-
--ignore tests/ut/worker/test_worker_v1.py \
125123
--ignore tests/ut/torchair/models/test_torchair_deepseek_mtp.py \
126124
--ignore tests/ut/torchair/models/test_torchair_deepseek_v2.py \
127125
--ignore tests/ut/test_utils.py \

tests/ut/worker/test_worker_v1.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def setUp(self):
4141
@patch("vllm_ascend.ops")
4242
@patch("vllm_ascend.worker.worker_v1._register_atb_extensions")
4343
@patch("vllm_ascend.worker.worker_v1.register_ascend_customop")
44+
@patch("vllm_ascend.worker.worker_v1.get_ascend_config")
4445
@patch("vllm_ascend.worker.worker_v1.init_ascend_config")
4546
@patch("vllm_ascend.worker.worker_v1.init_ascend_soc_version")
4647
@patch("vllm_ascend.worker.worker_v1.try_register_lib")
@@ -53,6 +54,7 @@ def test_init_npu_worker_normal_case(
5354
mock_try_register_lib,
5455
mock_init_ascend_soc_version,
5556
mock_init_ascend_config,
57+
mock_get_ascend_config,
5658
mock_register_ascend_customop,
5759
mock_register_atb_extensions,
5860
mock_ops,
@@ -61,6 +63,9 @@ def test_init_npu_worker_normal_case(
6163
"""Test NPUWorker normal initialization"""
6264
# Setup mock behavior
6365
mock_ops.register_dummy_fusion_op.return_value = None
66+
mock_ascend_config = MagicMock()
67+
mock_ascend_config.enable_cpu_binding = False
68+
mock_get_ascend_config.return_value = mock_ascend_config
6469

6570
# Import and create NPUWorker instance
6671
from vllm_ascend.worker.worker_v1 import NPUWorker
@@ -98,6 +103,7 @@ def test_init_npu_worker_normal_case(
98103
@patch("vllm_ascend.ops")
99104
@patch("vllm_ascend.worker.worker_v1._register_atb_extensions")
100105
@patch("vllm_ascend.worker.worker_v1.register_ascend_customop")
106+
@patch("vllm_ascend.worker.worker_v1.get_ascend_config")
101107
@patch("vllm_ascend.worker.worker_v1.init_ascend_config")
102108
@patch("vllm_ascend.worker.worker_v1.init_ascend_soc_version")
103109
@patch("vllm_ascend.worker.worker_v1.try_register_lib")
@@ -110,6 +116,7 @@ def test_init_npu_worker_with_trust_remote_code(
110116
mock_try_register_lib,
111117
mock_init_ascend_soc_version,
112118
mock_init_ascend_config,
119+
mock_get_ascend_config,
113120
mock_register_ascend_customop,
114121
mock_register_atb_extensions,
115122
mock_ops,
@@ -119,6 +126,9 @@ def test_init_npu_worker_with_trust_remote_code(
119126
# Set trust_remote_code=True
120127
self.model_config_mock.trust_remote_code = True
121128
mock_ops.register_dummy_fusion_op.return_value = None
129+
mock_ascend_config = MagicMock()
130+
mock_ascend_config.enable_cpu_binding = False
131+
mock_get_ascend_config.return_value = mock_ascend_config
122132

123133
# Create NPUWorker instance
124134
from vllm_ascend.worker.worker_v1 import NPUWorker
@@ -138,6 +148,7 @@ def test_init_npu_worker_with_trust_remote_code(
138148
@patch("vllm_ascend.ops")
139149
@patch("vllm_ascend.worker.worker_v1._register_atb_extensions")
140150
@patch("vllm_ascend.worker.worker_v1.register_ascend_customop")
151+
@patch("vllm_ascend.worker.worker_v1.get_ascend_config")
141152
@patch("vllm_ascend.worker.worker_v1.init_ascend_config")
142153
@patch("vllm_ascend.worker.worker_v1.init_ascend_soc_version")
143154
@patch("vllm_ascend.worker.worker_v1.try_register_lib")
@@ -150,6 +161,7 @@ def test_init_npu_worker_with_custom_cache_dtype(
150161
mock_try_register_lib,
151162
mock_init_ascend_soc_version,
152163
mock_init_ascend_config,
164+
mock_get_ascend_config,
153165
mock_register_ascend_customop,
154166
mock_register_atb_extensions,
155167
mock_ops,
@@ -159,6 +171,9 @@ def test_init_npu_worker_with_custom_cache_dtype(
159171
# Set custom cache_dtype
160172
self.cache_config_mock.cache_dtype = "float32"
161173
mock_ops.register_dummy_fusion_op.return_value = None
174+
mock_ascend_config = MagicMock()
175+
mock_ascend_config.enable_cpu_binding = False
176+
mock_get_ascend_config.return_value = mock_ascend_config
162177

163178
# Create NPUWorker instance
164179
from vllm_ascend.worker.worker_v1 import NPUWorker

0 commit comments

Comments
 (0)