[Refactor] [MoE] Rename moe-related classes & files by Pr0Wh1teGivee · Pull Request #3646 · vllm-project/vllm-ascend

Pr0Wh1teGivee · 2025-10-23T02:22:47Z

What this PR does / why we need it?

Rename common_fused_moe.py to fused_moe.py.
Rename fused_moe_prepare_and_finalize.py / FusedMoEPrepareAndFinalize to prepare_finalize.py / PrepareAndFinalize.
Rename vllm_ascend/ops/moe to vllm_ascend/ops/fused_moe.
Move vllm_ascend/ops/fused_moe.py to vllm_ascend/ops/fused_moe/fused_moe.py

Does this PR introduce any user-facing change?

No

How was this patch tested?

e2e & ut

vLLM version: v0.11.0rc3
vLLM main: vllm-project/vllm@17c540a

github-actions · 2025-10-23T02:23:02Z

👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:‌‌

A PR should do only one thing, smaller PRs enable faster reviews.
Every PR should include unit tests and end-to-end tests ‌to ensure it works and is not broken by other future PRs.
Write the commit message by fulfilling the PR description to help reviewer and future developers understand.

If CI fails, you can run linting and testing checks locally according Contributing and Testing.

gemini-code-assist

Code Review

This pull request is a refactoring effort to rename and restructure Mixture-of-Experts (MoE) related files. The changes are largely consistent with this goal, involving file moves and import path updates. However, I've identified a systematic error in the new import paths across several files. It appears a refactoring script may have incorrectly added an extra .fused_moe segment to many import paths, which will lead to ImportError exceptions and break the build. I have provided critical comments with suggestions to correct these paths. Apart from these import issues, the refactoring appears to be in good order.

gemini-code-assist · 2025-10-23T02:24:56Z

vllm_ascend/ops/fused_moe/fused_moe.py

+from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts
+from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import setup_moe_comm_method


The import paths for experts_selector and moe_comm_method are incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts

from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import setup_moe_comm_method

from vllm_ascend.ops.fused_moe.experts_selector import select_experts

from vllm_ascend.ops.fused_moe.moe_comm_method import setup_moe_comm_method

gemini-code-assist · 2025-10-23T02:24:56Z

vllm_ascend/ops/fused_moe/moe_comm_method.py

+from vllm_ascend.ops.fused_moe.fused_moe.prepare_finalize import (
+    PrepareAndFinalizeWithAll2All,
+    PrepareAndFinalizeWithAllGather, PrepareAndFinalizeWithMC2,
+    PrepareAndFinalizeWithNaiveMulticast)
+from vllm_ascend.ops.fused_moe.fused_moe.moe_mlp import unified_apply_mlp
+from vllm_ascend.ops.fused_moe.fused_moe.token_dispatcher import (TokenDispatcherWithAll2AllV,
                                                  TokenDispatcherWithAllGather,
                                                  TokenDispatcherWithMC2,
                                                  TokenDispatcherWithMoge)


The import paths for prepare_finalize, moe_mlp, and token_dispatcher are incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the import paths should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.prepare_finalize import (

PrepareAndFinalizeWithAll2All,

PrepareAndFinalizeWithAllGather, PrepareAndFinalizeWithMC2,

PrepareAndFinalizeWithNaiveMulticast)

from vllm_ascend.ops.fused_moe.fused_moe.moe_mlp import unified_apply_mlp

from vllm_ascend.ops.fused_moe.fused_moe.token_dispatcher import (TokenDispatcherWithAll2AllV,

TokenDispatcherWithAllGather,

TokenDispatcherWithMC2,

TokenDispatcherWithMoge)

from vllm_ascend.ops.fused_moe.prepare_finalize import (

PrepareAndFinalizeWithAll2All,

PrepareAndFinalizeWithAllGather, PrepareAndFinalizeWithMC2,

PrepareAndFinalizeWithNaiveMulticast)

from vllm_ascend.ops.fused_moe.moe_mlp import unified_apply_mlp

from vllm_ascend.ops.fused_moe.token_dispatcher import (TokenDispatcherWithAll2AllV,

TokenDispatcherWithAllGather,

TokenDispatcherWithMC2,

TokenDispatcherWithMoge)

gemini-code-assist · 2025-10-23T02:24:57Z

vllm_ascend/ops/fused_moe/token_dispatcher.py

+from vllm_ascend.ops.fused_moe.fused_moe.comm_utils import (
    async_all_to_all, gather_from_sequence_parallel_region)


The import path for comm_utils is incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.comm_utils import (

async_all_to_all, gather_from_sequence_parallel_region)

from vllm_ascend.ops.fused_moe.comm_utils import (

async_all_to_all, gather_from_sequence_parallel_region)

gemini-code-assist · 2025-10-23T02:24:57Z

vllm_ascend/quantization/w4a8_dynamic.py

 from vllm_ascend.ascend_config import get_ascend_config
 from vllm_ascend.distributed.parallel_state import get_mc2_group
-from vllm_ascend.ops.moe.experts_selector import select_experts
+from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts


The import path for experts_selector is incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts

from vllm_ascend.ops.fused_moe.experts_selector import select_experts

gemini-code-assist · 2025-10-23T02:24:57Z

vllm_ascend/quantization/w8a8.py


 from vllm_ascend.attention.attention_v1 import AscendAttentionState
-from vllm_ascend.ops.moe.experts_selector import select_experts
+from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts


The import path for experts_selector is incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts

from vllm_ascend.ops.fused_moe.experts_selector import select_experts

gemini-code-assist · 2025-10-23T02:24:57Z

vllm_ascend/quantization/w8a8_dynamic.py

 from vllm_ascend.ascend_config import get_ascend_config
 from vllm_ascend.distributed.parallel_state import get_mc2_group
-from vllm_ascend.ops.moe.experts_selector import select_experts
+from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts


The import path for experts_selector is incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts

from vllm_ascend.ops.fused_moe.experts_selector import select_experts

gemini-code-assist · 2025-10-23T02:24:57Z

vllm_ascend/ascend_forward_context.py

        forward_context = get_forward_context()

-        from vllm_ascend.ops.moe.moe_comm_method import get_moe_comm_method
+        from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import get_moe_comm_method


The import path for moe_comm_method is incorrect. The file vllm_ascend/ops/fused_moe/fused_moe.py is not a package, so you cannot import from it. The extra .fused_moe in the path should be removed.

Suggested change

from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import get_moe_comm_method

from vllm_ascend.ops.fused_moe.moe_comm_method import get_moe_comm_method

github-actions · 2025-10-24T02:49:13Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com>

### What this PR does / why we need it? 1. Rename common_fused_moe.py to fused_moe.py. 2. Rename fused_moe_prepare_and_finalize.py / FusedMoEPrepareAndFinalize to prepare_finalize.py / PrepareAndFinalize. 3. Rename vllm_ascend/ops/moe to vllm_ascend/ops/fused_moe. 4. Move vllm_ascend/ops/fused_moe.py to vllm_ascend/ops/fused_moe/fused_moe.py ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? e2e & ut - vLLM version: v0.11.0rc3 - vLLM main: vllm-project/vllm@17c540a Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com> Signed-off-by: luolun <luolun1995@cmbchina.com>

### What this PR does / why we need it? 1. Rename common_fused_moe.py to fused_moe.py. 2. Rename fused_moe_prepare_and_finalize.py / FusedMoEPrepareAndFinalize to prepare_finalize.py / PrepareAndFinalize. 3. Rename vllm_ascend/ops/moe to vllm_ascend/ops/fused_moe. 4. Move vllm_ascend/ops/fused_moe.py to vllm_ascend/ops/fused_moe/fused_moe.py ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? e2e & ut - vLLM version: v0.11.0rc3 - vLLM main: vllm-project/vllm@17c540a Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com> Signed-off-by: hwhaokun <haokun0405@163.com>

### What this PR does / why we need it? 1. Rename common_fused_moe.py to fused_moe.py. 2. Rename fused_moe_prepare_and_finalize.py / FusedMoEPrepareAndFinalize to prepare_finalize.py / PrepareAndFinalize. 3. Rename vllm_ascend/ops/moe to vllm_ascend/ops/fused_moe. 4. Move vllm_ascend/ops/fused_moe.py to vllm_ascend/ops/fused_moe/fused_moe.py ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? e2e & ut - vLLM version: v0.11.0rc3 - vLLM main: vllm-project/vllm@17c540a Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com> Signed-off-by: nsdie <yeyifan@huawei.com>

### What this PR does / why we need it? 1. Rename common_fused_moe.py to fused_moe.py. 2. Rename fused_moe_prepare_and_finalize.py / FusedMoEPrepareAndFinalize to prepare_finalize.py / PrepareAndFinalize. 3. Rename vllm_ascend/ops/moe to vllm_ascend/ops/fused_moe. 4. Move vllm_ascend/ops/fused_moe.py to vllm_ascend/ops/fused_moe/fused_moe.py ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? e2e & ut - vLLM version: v0.11.0rc3 - vLLM main: vllm-project/vllm@17c540a Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com>

github-actions bot added module:tests module:ops module:core module:quantization labels Oct 23, 2025

gemini-code-assist bot reviewed Oct 23, 2025

View reviewed changes

Pr0Wh1teGivee force-pushed the new_finalize_moe branch 2 times, most recently from ad23123 to eb5a40b Compare October 23, 2025 03:36

Pr0Wh1teGivee changed the title ~~[Refactor] [MoE] Rename moe-related files~~ [Refactor] [MoE] Rename moe-related classes & files Oct 23, 2025

Pr0Wh1teGivee force-pushed the new_finalize_moe branch from cb64583 to 6321254 Compare October 23, 2025 06:54

zzzzwwjj approved these changes Oct 23, 2025

View reviewed changes

weijinqian0 added the ready-for-test start test by label for PR label Oct 23, 2025

weijinqian0 approved these changes Oct 23, 2025

View reviewed changes

weijinqian0 added module:tests ready-for-test start test by label for PR ready read for review and removed module:tests ready-for-test start test by label for PR ready read for review labels Oct 23, 2025

github-actions bot added the merge-conflicts label Oct 24, 2025

Rename moe-related files

2250e59

Signed-off-by: Pr0Wh1teGivee <calvin_zhu0210@outlook.com>

Pr0Wh1teGivee force-pushed the new_finalize_moe branch from 6321254 to 2250e59 Compare October 25, 2025 01:10

github-actions bot removed the merge-conflicts label Oct 25, 2025

wangxiyuan approved these changes Oct 25, 2025

View reviewed changes

wangxiyuan merged commit 63c363d into vllm-project:main Oct 25, 2025
28 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Refactor] [MoE] Rename moe-related classes & files#3646

[Refactor] [MoE] Rename moe-related classes & files#3646
wangxiyuan merged 1 commit intovllm-project:mainfrom
Pr0Wh1teGivee:new_finalize_moe

Pr0Wh1teGivee commented Oct 23, 2025 •

edited by github-actions bot

Loading

Uh oh!

github-actions bot commented Oct 23, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

gemini-code-assist bot Oct 23, 2025

Uh oh!

github-actions bot commented Oct 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts
		from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import setup_moe_comm_method

		from vllm_ascend.ops.fused_moe.fused_moe.comm_utils import (
		async_all_to_all, gather_from_sequence_parallel_region)

	from vllm_ascend.ops.fused_moe.fused_moe.experts_selector import select_experts
	from vllm_ascend.ops.fused_moe.experts_selector import select_experts

	from vllm_ascend.ops.fused_moe.fused_moe.moe_comm_method import get_moe_comm_method
	from vllm_ascend.ops.fused_moe.moe_comm_method import get_moe_comm_method

Conversation

Pr0Wh1teGivee commented Oct 23, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does / why we need it?

Does this PR introduce any user-facing change?

How was this patch tested?

Uh oh!

github-actions bot commented Oct 23, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Oct 23, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Pr0Wh1teGivee commented Oct 23, 2025 •

edited by github-actions bot

Loading