-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[Feat] 310p support MoE W8A8 quantizaition #6641
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5ac957c
submit
pu-zhe f166b01
cleancode
pu-zhe a3ed4f6
cleancode
pu-zhe 5f51eb7
Add type ignore comment to fused_experts method
pu-zhe 5090284
fix ut
pu-zhe 84c0653
fix ut
pu-zhe 3739e73
Merge branch 'main' into moe_w8a8
pu-zhe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # | ||
| # Copyright (c) 2026 Huawei Technologies Co., Ltd. All Rights Reserved. | ||
| # | ||
| # 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. | ||
|
|
||
| import pytest | ||
| import torch | ||
|
|
||
| from vllm_ascend._310p.fused_moe.experts_selector import select_experts | ||
|
|
||
|
|
||
| class TestExpertsSelector310: | ||
| @pytest.mark.parametrize("global_num_experts", [256, 128]) | ||
| def test_select_experts(self, global_num_experts): | ||
| x = torch.randn(8, 2) | ||
| router_logits = torch.randn(8, 2) | ||
| topk_weights, topk_ids = select_experts( | ||
| hidden_states=x, | ||
| router_logits=router_logits, | ||
| top_k=2, | ||
| use_grouped_topk=False, | ||
| renormalize=True, | ||
| topk_group=None, | ||
| num_expert_group=None, | ||
| custom_routing_function=None, | ||
| scoring_func="softmax", | ||
| e_score_correction_bias=None, | ||
| global_num_experts=global_num_experts, | ||
| ) | ||
|
|
||
| assert topk_weights.shape == (8, 2) | ||
| assert topk_ids.shape == (8, 2) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| # | ||
| # Copyright (c) 2026 Huawei Technologies Co., Ltd. All Rights Reserved. | ||
| # | ||
| # 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. | ||
|
|
||
| from unittest.mock import call, patch | ||
|
|
||
| import torch | ||
|
|
||
| from tests.ut.base import TestBase | ||
| from vllm_ascend._310p.fused_moe.moe_mlp import unified_apply_mlp | ||
|
|
||
|
|
||
| class TestUnifiedApplyMLP310(TestBase): | ||
| @patch("torch_npu.npu_grouped_matmul") | ||
| @patch("torch_npu.npu_swiglu") | ||
| def test_unified_apply_mlp_without_quantization_310(self, mock_npu_swiglu, mock_npu_grouped_matmul): | ||
| mock_gmm1_out = torch.randn(10, 40, dtype=torch.float16) | ||
| mock_gmm2_out = torch.randn(10, 20, dtype=torch.float16) | ||
| mock_npu_grouped_matmul.side_effect = [[mock_gmm1_out], [mock_gmm2_out]] | ||
|
|
||
| mock_npu_swiglu_output = torch.randn(10, 40, dtype=torch.float16) | ||
| mock_npu_swiglu.return_value = mock_npu_swiglu_output | ||
|
|
||
| hidden_states = torch.randn(10, 20, dtype=torch.float16) | ||
| w1 = torch.randn(5, 20, 40, dtype=torch.float16) | ||
| w2 = torch.randn(5, 40, 20, dtype=torch.float16) | ||
| group_list = torch.tensor([2, 4, 6, 8, 10], dtype=torch.int64) | ||
|
|
||
| result = unified_apply_mlp( | ||
| hidden_states=hidden_states, | ||
| w1=w1, | ||
| w1_scale=None, | ||
| w2=w2, | ||
| w2_scale=None, | ||
| group_list=group_list, | ||
| group_list_type=1, | ||
| with_quant=False, | ||
| ) | ||
|
|
||
| self.assertEqual(mock_npu_grouped_matmul.call_count, 2) | ||
| mock_npu_grouped_matmul.assert_has_calls( | ||
| [ | ||
| call( | ||
| x=[hidden_states], weight=[w1], split_item=2, group_list_type=1, group_type=0, group_list=group_list | ||
| ), | ||
| call( | ||
| x=[mock_npu_swiglu_output], | ||
| weight=[w2], | ||
| split_item=2, | ||
| group_list_type=1, | ||
| group_type=0, | ||
| group_list=group_list, | ||
| ), | ||
| ], | ||
| any_order=True, | ||
| ) | ||
| mock_npu_swiglu.assert_called_once() | ||
| mock_npu_swiglu.assert_called_with(mock_gmm1_out) | ||
|
|
||
| self.assertEqual(result.shape, hidden_states.shape) | ||
| self.assertEqual(result.dtype, torch.float16) | ||
|
|
||
| @patch("torch.cumsum") | ||
| @patch("torch_npu.npu_quant_grouped_matmul_dequant") | ||
| @patch("torch_npu.npu_swiglu") | ||
| def test_unified_apply_mlp_with_quantization_310( | ||
| self, mock_npu_swiglu, mock_npu_quant_grouped_matmul_dequant, mock_cumsum | ||
| ): | ||
| mock_cumsum_out = torch.arange(0, 10, dtype=torch.int64) | ||
| mock_cumsum.return_value = mock_cumsum_out | ||
| mock_gmm1_out = torch.randn(10, 40, dtype=torch.float16) | ||
| mock_gmm2_out = torch.randn(10, 20, dtype=torch.float16) | ||
| mock_npu_quant_grouped_matmul_dequant.side_effect = [mock_gmm1_out, mock_gmm2_out] | ||
|
|
||
| mock_npu_swiglu_output = torch.randn(10, 40, dtype=torch.float16) | ||
| mock_npu_swiglu.return_value = mock_npu_swiglu_output | ||
|
|
||
| hidden_states = torch.randn(10, 20, dtype=torch.float16) | ||
| w1 = torch.randn(5, 20, 40, dtype=torch.float16) | ||
| w1_scale = torch.rand(5, 40, dtype=torch.float32) | ||
| w2 = torch.randn(5, 40, 20, dtype=torch.float16) | ||
| w2_scale = torch.rand(5, 40, dtype=torch.float32) | ||
| group_list = torch.tensor([2, 4, 6, 8, 10], dtype=torch.int64) | ||
|
|
||
| result = unified_apply_mlp( | ||
| hidden_states=hidden_states, | ||
| w1=w1, | ||
| w1_scale=w1_scale, | ||
| w2=w2, | ||
| w2_scale=w2_scale, | ||
| group_list=group_list, | ||
| group_list_type=1, | ||
| with_quant=True, | ||
| ) | ||
|
|
||
| mock_cumsum.assert_called_once() | ||
| self.assertEqual(mock_npu_quant_grouped_matmul_dequant.call_count, 2) | ||
| mock_npu_quant_grouped_matmul_dequant.assert_has_calls( | ||
| [ | ||
| call( | ||
| x=hidden_states, | ||
| quantized_weight=w1, | ||
| weight_scale=w1_scale, | ||
| group_list=mock_cumsum_out, | ||
| quant_mode="pertoken", | ||
| ), | ||
| call( | ||
| x=mock_npu_swiglu_output, | ||
| quantized_weight=w2, | ||
| weight_scale=w2_scale, | ||
| group_list=mock_cumsum_out, | ||
| quant_mode="pertoken", | ||
| ), | ||
| ], | ||
| any_order=True, | ||
| ) | ||
| mock_npu_swiglu.assert_called_once() | ||
| mock_npu_swiglu.assert_called_with(mock_gmm1_out) | ||
|
|
||
| self.assertEqual(result.shape, hidden_states.shape) | ||
| self.assertEqual(result.dtype, torch.float16) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| # | ||
| # Copyright (c) 2026 Huawei Technologies Co., Ltd. All Rights Reserved. | ||
| # | ||
| # 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. | ||
|
|
||
| from unittest.mock import Mock, patch | ||
|
|
||
| import torch | ||
|
|
||
| from tests.ut.base import TestBase | ||
| from vllm_ascend._310p.quantization.methods.w8a8_dynamic import AscendW8A8DynamicFusedMoEMethod310 | ||
|
|
||
|
|
||
| class TestAscendW8A8FusedMoEMethod310(TestBase): | ||
| num_experts = 8 | ||
| hidden_size = 128 | ||
| intermediate_size = 128 | ||
|
|
||
| @patch("vllm_ascend._310p.quantization.methods.w8a8_dynamic.get_ep_group") | ||
| def setUp(self, mock_get_ep_group): | ||
| with patch( | ||
| "vllm_ascend._310p.quantization.methods.w8a8_dynamic.get_current_vllm_config" | ||
| ) as mock_get_current_vllm_config: | ||
| mock_vllm_config = Mock() | ||
| mock_vllm_config.quant_config = Mock(quant_description={"group_size": 0}) | ||
| mock_vllm_config.scheduler_config = Mock( | ||
| max_num_batched_tokens=2048, max_model_len=2048, enable_chunked_prefill=False | ||
| ) | ||
| mock_get_current_vllm_config.return_value = mock_vllm_config | ||
| mock_ep_group = Mock() | ||
| mock_get_ep_group.return_value = mock_ep_group | ||
| mock_ascend_config = Mock() | ||
|
|
||
| mock_ascend_config.enable_chunked_prefill = False | ||
|
|
||
| self.quant_method = AscendW8A8DynamicFusedMoEMethod310() | ||
|
|
||
| def test_get_weight_310(self): | ||
| param_dict = self.quant_method.get_weight( | ||
| self.num_experts, self.intermediate_size, self.hidden_size, torch.float16 | ||
| ) | ||
| self.assertEqual(param_dict["w13_weight"].dtype, torch.int8) | ||
| self.assertEqual( | ||
| param_dict["w13_weight"].shape, (self.num_experts, 2 * self.intermediate_size, self.hidden_size) | ||
| ) | ||
| self.assertEqual(param_dict["w2_weight"].dtype, torch.int8) | ||
| self.assertEqual(param_dict["w2_weight"].shape, (self.num_experts, self.hidden_size, self.intermediate_size)) | ||
|
|
||
| def test_get_dynamic_quant_param_310(self): | ||
| param_dict = self.quant_method.get_dynamic_quant_param( | ||
| self.num_experts, self.intermediate_size, self.hidden_size, torch.float16 | ||
| ) | ||
| self.assertEqual(param_dict["w13_weight_scale"].dtype, torch.float32) | ||
| self.assertEqual(param_dict["w13_weight_scale"].shape, (self.num_experts, 2 * self.intermediate_size, 1)) | ||
| self.assertEqual(param_dict["w2_weight_scale"].dtype, torch.float32) | ||
| self.assertEqual(param_dict["w2_weight_scale"].shape, (self.num_experts, self.hidden_size, 1)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.