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

Reverts vllm-project/vllm-ascend#4194 as it broke CI in
https://github.com/vllm-project/vllm-ascend/actions/runs/20030369087/job/57437687382?pr=4791

Co-authored-by: wangxiyuan <wangxiyuan1007@gmail.com>
This commit is contained in:
Mengqing Cao
2025-12-08 23:20:32 +08:00
committed by GitHub
parent 432b861cae
commit 7e70da9fb7
39 changed files with 2 additions and 5562 deletions

View File

@@ -1,64 +0,0 @@
#include <string.h>
#include "graph/types.h"
#include "aclnn_dispatch_layout.h"
enum NnopbaseHcclServerType {
NNOPBASE_HCCL_SERVER_TYPE_AICPU = 0,
NNOPBASE_HCCL_SERVER_TYPE_MTE,
NNOPBASE_HCCL_SERVER_TYPE_END
};
extern "C" void __attribute__((weak)) NnopbaseSetHcclServerType(void *executor, NnopbaseHcclServerType sType);
#ifdef __cplusplus
extern "C" {
#endif
extern aclnnStatus aclnnInnerDispatchLayoutGetWorkspaceSize(
const aclTensor *topkIdx,
int64_t numTokens,
int64_t numRanks,
int64_t numExperts,
int64_t numTopk,
const aclTensor *numTokensPerRank,
const aclTensor *numTokensPerExpert,
const aclTensor *isTokenInRank,
uint64_t *workspaceSize,
aclOpExecutor **executor);
extern aclnnStatus aclnnInnerDispatchLayout(
void *workspace,
uint64_t workspaceSize,
aclOpExecutor *executor,
aclrtStream stream);
aclnnStatus aclnnDispatchLayoutGetWorkspaceSize(
const aclTensor *topkIdx,
int64_t numTokens,
int64_t numRanks,
int64_t numExperts,
int64_t numTopk,
const aclTensor *numTokensPerRank,
const aclTensor *numTokensPerExpert,
const aclTensor *isTokenInRank,
uint64_t *workspaceSize,
aclOpExecutor **executor)
{
return aclnnInnerDispatchLayoutGetWorkspaceSize(topkIdx, numTokens, numRanks, numExperts, numTopk, numTokensPerRank,
numTokensPerExpert, isTokenInRank, workspaceSize, executor);
}
aclnnStatus aclnnDispatchLayout(
void *workspace,
uint64_t workspaceSize,
aclOpExecutor *executor,
aclrtStream stream)
{
if (NnopbaseSetHcclServerType) {
NnopbaseSetHcclServerType(executor, NNOPBASE_HCCL_SERVER_TYPE_MTE);
}
return aclnnInnerDispatchLayout(workspace, workspaceSize, executor, stream);
}
#ifdef __cplusplus
}
#endif