[csrc][bugfix] Add compile-time Ascend950/910_95 compatibility for custom ops between CANN8.5 and 9.0 (#6936)
### What this PR does / why we need it?
Remove hardcoded ASCEND910_95 usage in csrc custom-op host/tiling code
and
select the SoC target at CMake configure time.
- Probe CANN headers with check_cxx_source_compiles:
prefer platform_ascendc::SocVersion::ASCEND950, fallback to
ASCEND910_95.
- Export the selected enum/config string via shared compile definitions
(VLLM_ASCEND_950_SOC_ENUM / VLLM_ASCEND_950_SOC_CONFIG).
- Apply the shared macros to affected paths (moe_gating_top_k,
add_rms_norm_bias) to avoid per-file hardcoding.
- Keep behavior unchanged; this is an internal build-compatibility fix
for CANN 8.5 and 9.x.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
- vLLM version: v0.16.0
- vLLM main:
15d76f74e2
---------
Signed-off-by: linfeng-yuan <1102311262@qq.com>
This commit is contained in:
@@ -63,9 +63,9 @@ public:
|
||||
.DynamicRankSupportFlag(true)
|
||||
.DynamicShapeSupportFlag(true)
|
||||
.ExtendCfgInfo("opFile.value", "moe_gating_top_k_apt");
|
||||
this->AICore().AddConfig("ascend910_95", regbaseCfg);
|
||||
this->AICore().AddConfig(VLLM_ASCEND_950_SOC_CONFIG, regbaseCfg);
|
||||
}
|
||||
};
|
||||
|
||||
OP_ADD(MoeGatingTopK);
|
||||
} // namespace ops
|
||||
} // namespace ops
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#define CEIL_DIV(a, b) (((a) + (b) - 1) / (b))
|
||||
#endif
|
||||
namespace optiling {
|
||||
const static uint64_t MOE_GATING_TOP_K_REGBASE_TILING_KEY = 10000;
|
||||
const static uint64_t MOE_GATING_TOP_K_ASCEND_950_TILING_KEY = 10000;
|
||||
|
||||
const static int64_t GROUP_SELECT_MODE_MAX = 0;
|
||||
const static int64_t GROUP_SELECT_MODE_SUM = 1;
|
||||
@@ -79,7 +79,7 @@ public:
|
||||
protected:
|
||||
bool IsCapable() override
|
||||
{
|
||||
if (socVersion != platform_ascendc::SocVersion::ASCEND910_95) {
|
||||
if (socVersion != platform_ascendc::SocVersion::VLLM_ASCEND_950_SOC_ENUM) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -508,7 +508,7 @@ ge::graphStatus MoeGatingTopKTilingRegbase::PostTiling()
|
||||
|
||||
uint64_t MoeGatingTopKTilingRegbase::GetTilingKey() const
|
||||
{
|
||||
return MOE_GATING_TOP_K_REGBASE_TILING_KEY;
|
||||
return MOE_GATING_TOP_K_ASCEND_950_TILING_KEY;
|
||||
}
|
||||
|
||||
void MoeGatingTopKTilingRegbase::Reset()
|
||||
|
||||
Reference in New Issue
Block a user