Skip to content

Revert "[Kernel] add custom moe ops for prefill" #4806

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.

Sign up for GitHub

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
wangxiyuan merged 2 commits into from
Dec 8, 2025
Merged

Revert "[Kernel] add custom moe ops for prefill" #4806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6fdf9
Revert "[Kernel] add custom moe ops for prefill (#4194)"
MengqingCao Dec 8, 2025
e727093
Merge branch 'main' into revert-4194-add_moe_normal
wangxiyuan Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions csrc/build_aclnn.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,7 @@ elif [[ "$SOC_VERSION" =~ ^ascend910_93 ]]; then

sed -i 's/struct HcclOpResParam {/struct HcclOpResParamCustom {/g' "$TARGET_FILE"
sed -i 's/struct HcclRankRelationResV2 {/struct HcclRankRelationResV2Custom {/g' "$TARGET_FILE"

CUSTOM_OPS_ARRAY=(
"grouped_matmul_swiglu_quant_weight_nz_tensor_list"
"lightning_indexer"
"sparse_flash_attention"
"dispatch_ffn_combine"
"dispatch_gmm_combine_decode"
"moe_combine_normal"
"moe_dispatch_normal"
"dispatch_layout"
"notify_dispatch"
)
CUSTOM_OPS=$(IFS=';'; echo "${CUSTOM_OPS_ARRAY[*]}")
CUSTOM_OPS="grouped_matmul_swiglu_quant_weight_nz_tensor_list;lightning_indexer;sparse_flash_attention;dispatch_ffn_combine;dispatch_gmm_combine_decode;"
SOC_ARG="ascend910_93"
else
# others
Expand All @@ -70,7 +58,7 @@ fi
cd csrc
rm -rf build output
echo "building custom ops $CUSTOM_OPS for $SOC_VERSION"
bash build.sh -n "$CUSTOM_OPS" -c "$SOC_ARG"
bash build.sh -n $CUSTOM_OPS -c $SOC_ARG
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

While this change is part of a revert to fix a CI failure, removing the quotes around $CUSTOM_OPS and $SOC_ARG is generally unsafe in shell scripting as it can lead to unexpected word splitting and globbing if the variables were to contain spaces or special characters. If these variables must be unquoted for the build.sh script to work correctly, it would be beneficial to add a comment explaining why. This would prevent future contributors from re-introducing quotes and breaking the build again. An even better long-term solution would be to make build.sh robust enough to handle quoted arguments correctly.


# install custom ops to vllm_ascend/_cann_ops_custom
./output/CANN-custom_ops*.run --install-path=$ROOT_DIR/vllm_ascend/_cann_ops_custom
49 changes: 0 additions & 49 deletions csrc/dispatch_layout/op_host/CMakeLists.txt
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions csrc/dispatch_layout/op_host/aclnn_dispatch_layout.cpp
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions csrc/dispatch_layout/op_host/aclnn_dispatch_layout.h
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions csrc/dispatch_layout/op_host/dispatch_layout.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading