Skip to content

Commit bb76f79

Browse files
cleanup useless torchair logic (#4856)
This PR clean up useless torchair logic in model runner. The moge doc is only for torchair, it can be removed as well. - vLLM version: v0.12.0 - vLLM main: vllm-project/vllm@ad32e3e Signed-off-by: wangxiyuan <[email protected]> Co-authored-by: Mengqing Cao <[email protected]>
1 parent c12eb22 commit bb76f79

File tree

7 files changed

+22
-307
lines changed

7 files changed

+22
-307
lines changed

docs/source/tutorials/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ single_node_pd_disaggregation_mooncake
1313
multi_npu_qwen3_next
1414
multi_npu
1515
multi_npu_kimi-k2-thinking
16-
multi_npu_moge
1716
Qwen3-Dense
1817
multi_npu_qwen3_moe
1918
multi_npu_quantization

docs/source/tutorials/multi_npu_moge.md

Lines changed: 0 additions & 235 deletions
This file was deleted.

tests/ut/test_platform.py

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ def test_clear_npu_memory_reset_stats_failure(self, mock_reset_stats,
229229
mock_empty_cache.assert_called_once()
230230
mock_reset_stats.assert_called_once()
231231

232-
@patch("vllm_ascend.ascend_config.check_ascend_config")
233232
@patch("vllm_ascend.ascend_config.init_ascend_config")
234233
@patch("vllm_ascend.utils.update_aclgraph_sizes")
235234
@patch('vllm_ascend.utils.get_ascend_device_type',
@@ -240,7 +239,7 @@ def test_clear_npu_memory_reset_stats_failure(self, mock_reset_stats,
240239
)
241240
def test_check_and_update_config_basic_config_update(
242241
self, mock_init_recompute, mock_soc_version, mock_update_acl,
243-
mock_init_ascend, mock_check_ascend):
242+
mock_init_ascend):
244243
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
245244
)
246245
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -263,18 +262,15 @@ def test_check_and_update_config_basic_config_update(
263262
self.platform.check_and_update_config(vllm_config)
264263

265264
mock_init_ascend.assert_called_once_with(vllm_config)
266-
mock_check_ascend.assert_called_once()
267265

268266
@patch('vllm_ascend.utils.get_ascend_device_type',
269267
return_value=AscendDeviceType._910_93)
270-
@patch("vllm_ascend.ascend_config.check_ascend_config")
271268
@patch("vllm_ascend.ascend_config.init_ascend_config")
272269
@patch(
273270
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
274271
)
275272
def test_check_and_update_config_no_model_config_warning(
276-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
277-
mock_soc_version):
273+
self, mock_init_recompute, mock_init_ascend, mock_soc_version):
278274
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
279275
)
280276
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -294,14 +290,12 @@ def test_check_and_update_config_no_model_config_warning(
294290

295291
@patch('vllm_ascend.utils.get_ascend_device_type',
296292
return_value=AscendDeviceType._910_93)
297-
@patch("vllm_ascend.ascend_config.check_ascend_config")
298293
@patch("vllm_ascend.ascend_config.init_ascend_config")
299294
@patch(
300295
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
301296
)
302297
def test_check_and_update_config_enforce_eager_mode(
303-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
304-
mock_soc_version):
298+
self, mock_init_recompute, mock_init_ascend, mock_soc_version):
305299
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
306300
)
307301
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -333,14 +327,13 @@ def test_check_and_update_config_enforce_eager_mode(
333327
@patch('vllm_ascend.utils.get_ascend_device_type',
334328
return_value=AscendDeviceType._910_93)
335329
@patch("vllm_ascend.utils.update_default_aclgraph_sizes")
336-
@patch("vllm_ascend.ascend_config.check_ascend_config")
337330
@patch("vllm_ascend.ascend_config.init_ascend_config")
338331
@patch(
339332
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
340333
)
341334
def test_check_and_update_config_unsupported_compilation_level(
342-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
343-
mock_update_default, mock_soc_version):
335+
self, mock_init_recompute, mock_init_ascend, mock_update_default,
336+
mock_soc_version):
344337
mock_update_default.return_value = MagicMock()
345338
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
346339
)
@@ -374,10 +367,9 @@ def test_check_and_update_config_unsupported_compilation_level(
374367
"Revert me when vllm support setting cudagraph_mode on oot platform")
375368
@patch('vllm_ascend.utils.get_ascend_device_type',
376369
return_value=AscendDeviceType._910_93)
377-
@patch("vllm_ascend.ascend_config.check_ascend_config")
378370
@patch("vllm_ascend.ascend_config.init_ascend_config")
379371
def test_check_and_update_config_unsupported_cudagraph_mode(
380-
self, mock_init_ascend, mock_check_ascend, mock_soc_version):
372+
self, mock_init_ascend, mock_soc_version):
381373
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
382374
)
383375
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -404,14 +396,12 @@ def test_check_and_update_config_unsupported_cudagraph_mode(
404396

405397
@patch('vllm_ascend.utils.get_ascend_device_type',
406398
return_value=AscendDeviceType._910_93)
407-
@patch("vllm_ascend.ascend_config.check_ascend_config")
408399
@patch("vllm_ascend.ascend_config.init_ascend_config")
409400
@patch(
410401
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
411402
)
412403
def test_check_and_update_config_cache_config_block_size(
413-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
414-
mock_soc_version):
404+
self, mock_init_recompute, mock_init_ascend, mock_soc_version):
415405
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
416406
)
417407
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -433,14 +423,12 @@ def test_check_and_update_config_cache_config_block_size(
433423

434424
@patch('vllm_ascend.utils.get_ascend_device_type',
435425
return_value=AscendDeviceType._910_93)
436-
@patch("vllm_ascend.ascend_config.check_ascend_config")
437426
@patch("vllm_ascend.ascend_config.init_ascend_config")
438427
@patch(
439428
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
440429
)
441430
def test_check_and_update_config_v1_worker_class_selection(
442-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
443-
mock_soc_version):
431+
self, mock_init_recompute, mock_init_ascend, mock_soc_version):
444432
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
445433
)
446434
vllm_config = TestNPUPlatform.mock_vllm_config()
@@ -471,16 +459,14 @@ def test_check_and_update_config_v1_worker_class_selection(
471459
"vllm_ascend.xlite.xlite_worker.XliteWorker",
472460
)
473461

474-
@patch("vllm_ascend.ascend_config.check_ascend_config")
475462
@patch("vllm_ascend.ascend_config.init_ascend_config")
476463
@patch('vllm_ascend.utils.get_ascend_device_type',
477464
return_value=AscendDeviceType._310P)
478465
@patch(
479466
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
480467
)
481468
def test_check_and_update_config_310p_no_custom_ops(
482-
self, mock_init_recompute, mock_soc_version, mock_init_ascend,
483-
mock_check_ascend):
469+
self, mock_init_recompute, mock_soc_version, mock_init_ascend):
484470
mock_init_ascend.return_value = TestNPUPlatform.mock_vllm_ascend_config(
485471
)
486472
vllm_config = TestNPUPlatform.mock_vllm_config()

vllm_ascend/ascend_config.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,3 @@ def get_ascend_config():
289289
"Ascend config is not initialized. Please call init_ascend_config first."
290290
)
291291
return _ASCEND_CONFIG
292-
293-
294-
def check_ascend_config(vllm_config, enforce_eager):
295-
ascend_config = get_ascend_config()
296-
297-
if ascend_config.ascend_compilation_config.enable_quantization_fusion:
298-
logger.info(
299-
"Quantization fusion enabled! op fusion on quantization are expected. "
300-
)

0 commit comments

Comments
 (0)