cb893bcdb0
### 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>
78 lines
3.7 KiB
CMake
78 lines
3.7 KiB
CMake
# Copyright (c) 2024 Huawei Technologies Co., Ltd.
|
|
# This file is a part of the CANN Open Software.
|
|
# Licensed under CANN Open Software License Agreement Version 1.0 (the "License").
|
|
# Please refer to the License for details. You may not use this file except in compliance with the License.
|
|
# THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
|
|
# INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
|
|
# See LICENSE in the root of the software repository for the full text of the License.
|
|
# ======================================================================================================================
|
|
|
|
# Custom package scenario, public compilation configuration for Host side targets
|
|
# Note: To ensure compatibility with the built-in package compilation process, the intf_pub name cannot be changed
|
|
add_library(intf_pub INTERFACE)
|
|
target_include_directories(intf_pub
|
|
INTERFACE
|
|
${ASCEND_CANN_PACKAGE_PATH}/include
|
|
${ASCEND_CANN_PACKAGE_PATH}/include/external
|
|
${ASCEND_CANN_PACKAGE_PATH}/include/experiment/platform
|
|
${ASCEND_CANN_PACKAGE_PATH}/include/experiment/runtime
|
|
${ASCEND_CANN_PACKAGE_PATH}/include/experiment/msprof
|
|
)
|
|
target_link_directories(intf_pub
|
|
INTERFACE
|
|
${ASCEND_CANN_PACKAGE_PATH}/lib64
|
|
)
|
|
target_compile_options(intf_pub
|
|
INTERFACE
|
|
-fPIC
|
|
-O2
|
|
-Wall -Wundef -Wcast-qual -Wpointer-arith -Wdate-time
|
|
-Wfloat-equal -Wformat=2 -Wshadow
|
|
-Wsign-compare -Wunused-macros -Wvla -Wdisabled-optimization -Wempty-body -Wignored-qualifiers
|
|
-Wimplicit-fallthrough=3 -Wtype-limits -Wshift-negative-value -Wswitch-default
|
|
-Wframe-larger-than=32768 -Woverloaded-virtual
|
|
-Wnon-virtual-dtor -Wshift-overflow=2 -Wshift-count-overflow
|
|
-Wwrite-strings -Wmissing-format-attribute -Wformat-nonliteral
|
|
-Wdelete-non-virtual-dtor -Wduplicated-cond
|
|
-Wtrampolines -Wsized-deallocation -Wlogical-op -Wsuggest-attribute=format
|
|
-Wduplicated-branches
|
|
-Wmissing-include-dirs -Wformat-signedness
|
|
-Wreturn-local-addr -Wextra
|
|
-Wredundant-decls -Wfloat-conversion
|
|
-Wno-write-strings -Wall -Wno-dangling-else -Wno-comment -Wno-conversion-null -Wno-return-type
|
|
-Wno-unknown-pragmas -Wno-sign-compare
|
|
-Wno-error=undef
|
|
-Wno-error=comment
|
|
-Wno-error=conversion-null
|
|
-Wno-error=dangling-else
|
|
-Wno-error=return-type
|
|
-Wno-error=shadow
|
|
-Wno-error=sign-compare
|
|
-Wno-error=unknown-pragmas
|
|
-Wno-error=unused-parameter
|
|
-Wno-error=cast-qual
|
|
-Wno-error=format=
|
|
-Wno-error=maybe-uninitialized
|
|
-Wno-error=missing-field-initializers
|
|
-Wno-error=redundant-decls
|
|
-Wno-error=unused-variable
|
|
$<$<COMPILE_LANGUAGE:C>:-Wnested-externs>
|
|
$<$<CONFIG:Debug>:-g>
|
|
$<IF:$<VERSION_GREATER:${CMAKE_C_COMPILER_VERSION},4.8.5>,-fstack-protector-strong,-fstack-protector-all>
|
|
)
|
|
target_compile_definitions(intf_pub
|
|
INTERFACE
|
|
$<$<COMPILE_LANGUAGE:CXX>:_GLIBCXX_USE_CXX11_ABI=0>
|
|
$<$<CONFIG:Release>:_FORTIFY_SOURCE=2>
|
|
$<$<COMPILE_LANGUAGE:CXX>:VLLM_ASCEND_950_SOC_ENUM=${VLLM_ASCEND_950_SOC_ENUM}>
|
|
$<$<COMPILE_LANGUAGE:CXX>:VLLM_ASCEND_950_SOC_CONFIG=\"${VLLM_ASCEND_950_SOC_CONFIG}\">
|
|
)
|
|
target_link_options(intf_pub
|
|
INTERFACE
|
|
$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-pie>
|
|
$<$<CONFIG:Release>:-s>
|
|
-Wl,-z,relro
|
|
-Wl,-z,now
|
|
-Wl,-z,noexecstack
|
|
)
|