a0315f6697
### What this PR does / why we need it? This pull request enables the `npugraph_ex` backend by default to improve performance on Ascend NPUs, as proposed in the [RFC](https://github.com/vllm-project/vllm-ascend/issues/6214). ### Does this PR introduce _any_ user-facing change? Yes. `npugraph_ex` is now enabled by default. Users can disable it by setting `enable: false` in the `npugraph_ex_config` section of the `additional_config`. ### How was this patch tested? CI passed. The changes are covered by existing and new E2E tests (`test_aclgraph_accuracy.py`) and unit tests (`test_ascend_config.py`) that have been updated to reflect the new default behavior. The tests verify correctness and consistency with `npugraph_ex` enabled and disabled, as well as with the new static kernel option. Signed-off-by: huyuanquan1 <huyuanquan1@huawei.com> Co-authored-by: huyuanquan1 <huyuanquan1@huawei.com>
117 lines
4.7 KiB
Python
117 lines
4.7 KiB
Python
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
# This file is a part of the vllm-ascend project.
|
|
#
|
|
|
|
from unittest.mock import patch
|
|
|
|
from vllm.config import VllmConfig
|
|
|
|
from tests.ut.base import TestBase
|
|
from vllm_ascend.ascend_config import clear_ascend_config, get_ascend_config, init_ascend_config
|
|
|
|
|
|
class TestAscendConfig(TestBase):
|
|
@staticmethod
|
|
def _clean_up_ascend_config(func):
|
|
def wrapper(*args, **kwargs):
|
|
clear_ascend_config()
|
|
func(*args, **kwargs)
|
|
clear_ascend_config()
|
|
|
|
return wrapper
|
|
|
|
@_clean_up_ascend_config
|
|
@patch("vllm_ascend.platform.NPUPlatform._fix_incompatible_config")
|
|
def test_init_ascend_config_without_additional_config(self, mock_fix_incompatible_config):
|
|
test_vllm_config = VllmConfig()
|
|
# No additional config given, check the default value here.
|
|
ascend_config = init_ascend_config(test_vllm_config)
|
|
self.assertFalse(ascend_config.multistream_overlap_shared_expert)
|
|
self.assertFalse(ascend_config.enable_kv_nz)
|
|
|
|
ascend_compilation_config = ascend_config.ascend_compilation_config
|
|
self.assertTrue(ascend_compilation_config.fuse_norm_quant)
|
|
|
|
ascend_fusion_config = ascend_config.ascend_fusion_config
|
|
self.assertTrue(ascend_fusion_config.fusion_ops_gmmswigluquant)
|
|
|
|
@_clean_up_ascend_config
|
|
@patch("vllm_ascend.platform.NPUPlatform._fix_incompatible_config")
|
|
def test_init_ascend_config_with_additional_config(self, mock_fix_incompatible_config):
|
|
test_vllm_config = VllmConfig()
|
|
test_vllm_config.additional_config = {
|
|
"ascend_compilation_config": {
|
|
"fuse_norm_quant": False,
|
|
},
|
|
"ascend_fusion_config": {
|
|
"fusion_ops_gmmswigluquant": False,
|
|
},
|
|
"multistream_overlap_shared_expert": True,
|
|
"eplb_config": {"num_redundant_experts": 2},
|
|
"refresh": True,
|
|
"enable_kv_nz": False,
|
|
}
|
|
ascend_config = init_ascend_config(test_vllm_config)
|
|
self.assertEqual(ascend_config.eplb_config.num_redundant_experts, 2)
|
|
self.assertTrue(ascend_config.multistream_overlap_shared_expert)
|
|
|
|
npugraph_ex_config = ascend_config.npugraph_ex_config
|
|
self.assertTrue(npugraph_ex_config.enable)
|
|
self.assertFalse(npugraph_ex_config.enable_static_kernel)
|
|
|
|
ascend_compilation_config = ascend_config.ascend_compilation_config
|
|
self.assertFalse(ascend_compilation_config.fuse_norm_quant)
|
|
self.assertFalse(ascend_config.enable_kv_nz)
|
|
|
|
ascend_fusion_config = ascend_config.ascend_fusion_config
|
|
self.assertFalse(ascend_fusion_config.fusion_ops_gmmswigluquant)
|
|
|
|
@_clean_up_ascend_config
|
|
@patch("vllm_ascend.platform.NPUPlatform._fix_incompatible_config")
|
|
def test_init_ascend_config_enable_npugraph_ex(self, mock_fix_incompatible_config):
|
|
test_vllm_config = VllmConfig()
|
|
test_vllm_config.additional_config = {
|
|
"npugraph_ex_config": {
|
|
"enable": True,
|
|
"enable_static_kernel": True
|
|
},
|
|
"refresh": True
|
|
}
|
|
npugraph_ex_config = init_ascend_config(
|
|
test_vllm_config).npugraph_ex_config
|
|
self.assertTrue(npugraph_ex_config.enable)
|
|
self.assertTrue(npugraph_ex_config.enable_static_kernel)
|
|
|
|
@_clean_up_ascend_config
|
|
@patch("vllm_ascend.platform.NPUPlatform._fix_incompatible_config")
|
|
def test_get_ascend_config(self, mock_fix_incompatible_config):
|
|
test_vllm_config = VllmConfig()
|
|
ascend_config = init_ascend_config(test_vllm_config)
|
|
self.assertEqual(get_ascend_config(), ascend_config)
|
|
|
|
@_clean_up_ascend_config
|
|
def test_get_ascend_config_without_init(self):
|
|
with self.assertRaises(RuntimeError):
|
|
get_ascend_config()
|
|
|
|
@_clean_up_ascend_config
|
|
@patch("vllm_ascend.platform.NPUPlatform._fix_incompatible_config")
|
|
def test_clear_ascend_config(self, mock_fix_incompatible_config):
|
|
test_vllm_config = VllmConfig()
|
|
ascend_config = init_ascend_config(test_vllm_config)
|
|
self.assertEqual(get_ascend_config(), ascend_config)
|
|
clear_ascend_config()
|
|
with self.assertRaises(RuntimeError):
|
|
get_ascend_config()
|