Skip to content

Commit 94a3c82

Browse files
committed
[CI] Drop ascend scheduler from test
Signed-off-by: wangxiyuan <[email protected]>
1 parent 981a14f commit 94a3c82

File tree

7 files changed

+1
-165
lines changed

7 files changed

+1
-165
lines changed

.github/workflows/_e2e_test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
pytest -sv tests/e2e/singlecard/test_completion_with_prompt_embeds.py
9292
pytest -sv tests/e2e/singlecard/test_aclgraph.py
9393
pytest -sv tests/e2e/singlecard/test_aclgraph_mem.py
94-
pytest -sv tests/e2e/singlecard/test_ascend_scheduler.py
9594
pytest -sv tests/e2e/singlecard/test_bge_model.py
9695
pytest -sv tests/e2e/singlecard/test_camem.py
9796
pytest -sv tests/e2e/singlecard/test_embedding.py

tests/e2e/singlecard/test_ascend_scheduler.py

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

tests/ut/quantization/test_w8a8_dynamic.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ def setUp(self, mock_get_ep_group, mock_get_ascend_config,
3333
mock_get_ep_group.return_value = mock_ep_group
3434
mock_ascend_config = Mock()
3535

36-
# 创建一个具有具体属性的 Mock 对象来表示 ascend_scheduler_config
37-
mock_ascend_scheduler_config = Mock()
38-
mock_ascend_scheduler_config.enabled = False
39-
mock_ascend_scheduler_config.max_num_batched_tokens = 1024
40-
mock_ascend_scheduler_config.max_model_len = 2048
41-
mock_ascend_config.ascend_scheduler_config = mock_ascend_scheduler_config
42-
4336
mock_ascend_config.torchair_graph_config = Mock(enabled=False)
4437
mock_ascend_config.enable_chunked_prefill = False
4538
mock_get_ascend_config.return_value = mock_ascend_config

tests/ut/test_ascend_config.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ def test_init_ascend_config_without_additional_config(self):
5656
self.assertTrue(torchair_graph_config.enable_frozen_parameter)
5757
self.assertFalse(torchair_graph_config.enable_kv_nz)
5858

59-
ascend_scheduler_config = ascend_config.ascend_scheduler_config
60-
self.assertFalse(ascend_scheduler_config.enabled)
61-
6259
@_clean_up_ascend_config
6360
def test_init_ascend_config_with_additional_config(self):
6461
test_vllm_config = VllmConfig()
@@ -74,9 +71,6 @@ def test_init_ascend_config_with_additional_config(self):
7471
"enable_kv_nz": True
7572
},
7673
"multistream_overlap_shared_expert": True,
77-
"ascend_scheduler_config": {
78-
"enabled": True
79-
},
8074
"expert_map_path": "test_expert_map_path",
8175
"refresh": True,
8276
}
@@ -94,9 +88,6 @@ def test_init_ascend_config_with_additional_config(self):
9488
self.assertTrue(torchair_graph_config.enable_frozen_parameter)
9589
self.assertTrue(torchair_graph_config.enable_kv_nz)
9690

97-
ascend_scheduler_config = ascend_config.ascend_scheduler_config
98-
self.assertTrue(ascend_scheduler_config.enabled)
99-
10091
@_clean_up_ascend_config
10192
def test_init_ascend_config_with_refresh(self):
10293
test_vllm_config = VllmConfig()

tests/ut/test_platform.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -522,31 +522,6 @@ def test_check_and_update_config_310p_no_custom_ops(
522522
self.platform.check_and_update_config(vllm_config)
523523
self.assertEqual(vllm_config.compilation_config.custom_ops, [])
524524

525-
@patch('vllm_ascend.utils.get_ascend_device_type',
526-
return_value=AscendDeviceType._910_93)
527-
@patch("vllm_ascend.ascend_config.check_ascend_config")
528-
@patch("vllm_ascend.ascend_config.init_ascend_config")
529-
@patch(
530-
"vllm_ascend.core.recompute_schedule_config.RecomputeSchedulerConfig.initialize_from_config"
531-
)
532-
def test_check_and_update_config_ascend_scheduler_config(
533-
self, mock_init_recompute, mock_init_ascend, mock_check_ascend,
534-
mock_soc_version):
535-
mock_ascend_config = TestNPUPlatform.mock_vllm_ascend_config()
536-
mock_ascend_config.ascend_scheduler_config.enabled = True
537-
mock_init_ascend.return_value = mock_ascend_config
538-
vllm_config = TestNPUPlatform.mock_vllm_config()
539-
vllm_config.parallel_config.tensor_parallel_size = 1
540-
mock_init_recompute.return_value = MagicMock()
541-
542-
with patch("vllm_ascend.core.schedule_config.AscendSchedulerConfig"
543-
) as mock_scheduler:
544-
from vllm_ascend import platform
545-
546-
importlib.reload(platform)
547-
self.platform.check_and_update_config(vllm_config)
548-
mock_scheduler.initialize_from_config.assert_called_once()
549-
550525
@patch('vllm_ascend.platform.get_ascend_config')
551526
def test_get_attn_backend_cls_use_v1_and_mla(self, mock_get_ascend_config):
552527
mock_config = MagicMock()

tests/ut/test_utils.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,10 @@ def test_update_aclgraph_sizes(self):
253253
model_path = os.path.join(os.path.dirname(__file__), "fake_weight")
254254
test_model_config = ModelConfig(model=model_path, enforce_eager=True)
255255
test_parallel_config = ParallelConfig()
256-
ascend_config = {"ascend_scheduler_config": {"enabled": False}}
257256
test_vllm_config = VllmConfig(
258257
model_config=test_model_config,
259258
compilation_config=test_compilation_config,
260-
parallel_config=test_parallel_config,
261-
additional_config=ascend_config)
259+
parallel_config=test_parallel_config)
262260
utils.update_aclgraph_sizes(test_vllm_config)
263261
os.environ['HCCL_OP_EXPANSION_MODE'] = 'AIV'
264262
utils.update_aclgraph_sizes(test_vllm_config)

tests/ut/torchair/models/test_torchair_deepseek_v2.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ def test_torchair_deepseek_v2_mlp(mock_distributed, base_config):
235235
hidden_act="silu",
236236
quant_config=None)
237237
assert isinstance(mlp.act_fn, TorchairDeepseekV2SiluAndMul)
238-
ascend_config = MagicMock()
239-
ascend_config._ASCEND_CONFIG.ascend_scheduler_config.enabled = False
240238
with patch(
241239
"vllm_ascend.torchair.models.torchair_deepseek_v2.QuantizationConfig"
242240
) as mock_quant_config:

0 commit comments

Comments
 (0)