Merged
fix(5162a): 区分 5162 的 soc 版本与短名/series 命名 #15086
wuxueningAdd on 14 days ago
fix(5162a): 区分 5162 的 soc 版本与短名/series 命名 #15086
Merged
Total: 7 files changed+10-10
| @@ -53,11 +53,11 @@ set(ASCEND_OP_NAME "ALL" CACHE STRING | |||
| 53 | set(ASCEND_MODULE_NAME "ALL" CACHE STRING "modules that need to be compiled") | 53 | set(ASCEND_MODULE_NAME "ALL" CACHE STRING "modules that need to be compiled") |
| 54 | set(ARCH_DIRECTORY "" CACHE STRING "arch directory that need to be compiled") | 54 | set(ARCH_DIRECTORY "" CACHE STRING "arch directory that need to be compiled") |
| 55 | set(VENDOR_NAME "custom" CACHE STRING "vendor name") | 55 | set(VENDOR_NAME "custom" CACHE STRING "vendor name") |
| 56 | -set(ASCEND_ALL_COMPUTE_UNIT "ascend910b;ascend910_93;ascend950;ascend960dt;ascend960pr;ascend350;mc62;kirinx90;kirin9030;ascend5162a" CACHE STRING "all soc list") | 56 | +set(ASCEND_ALL_COMPUTE_UNIT "ascend910b;ascend910_93;ascend950;ascend960dt;ascend960pr;ascend350;mc62;kirinx90;kirin9030;ascend5162" CACHE STRING "all soc list") |
| 57 | set(ASCEND_ALL_MODULE_NAME "mc2;attention;moe;ffn;mhc;posembedding;gmm;mamba" CACHE STRING "all module list") | 57 | set(ASCEND_ALL_MODULE_NAME "mc2;attention;moe;ffn;mhc;posembedding;gmm;mamba" CACHE STRING "all module list") |
| 58 | 58 | ||
| 59 | -#SOC和ARCH目录对应关系:ascend310p:arch20,ascend910b:arch22,ascend910_93:arch22,ascend950:arch35,ascend960dt/ascend960pr:arch35+arch92,ascend350:arch35,mc62:arch38,kirinx90:arch22,kirin9030:arch22,ascend5162a:arch35 | 59 | +#SOC和ARCH目录对应关系:ascend310p:arch20,ascend910b:arch22,ascend910_93:arch22,ascend950:arch35,ascend960dt/ascend960pr:arch35+arch92,ascend350:arch35,mc62:arch38,kirinx90:arch22,kirin9030:arch22,ascend5162:arch35 |
| 60 | -set(SOC_VERSION_LIST ascend310p ascend910b ascend910_93 ascend950 ascend960dt ascend960pr ascend350 mc62 kirinx90 kirin9030 ascend5162a) | 60 | +set(SOC_VERSION_LIST ascend310p ascend910b ascend910_93 ascend950 ascend960dt ascend960pr ascend350 mc62 kirinx90 kirin9030 ascend5162) |
| 61 | set(ARCH_DIRECTORY_LIST arch20 arch22 arch22 arch35 arch35 arch35 arch35 arch38 arch22 arch22 arch35) | 61 | set(ARCH_DIRECTORY_LIST arch20 arch22 arch22 arch35 arch35 arch35 arch35 arch38 arch22 arch22 arch35) |
| 62 | set(BISHENG_FLAGS "" CACHE STRING "bisheng compiler flags") | 62 | set(BISHENG_FLAGS "" CACHE STRING "bisheng compiler flags") |
| 63 | set(ENABLE_AICPU_KERNEL FALSE CACHE BOOL "Enable AICPU Kernel") | 63 | set(ENABLE_AICPU_KERNEL FALSE CACHE BOOL "Enable AICPU Kernel") |
| @@ -355,7 +355,7 @@ add_subdirectory(common) | |||
| 355 | 355 | ||
| 356 | if (NOT BUILD_OPS_RTY_KERNEL) | 356 | if (NOT BUILD_OPS_RTY_KERNEL) |
| 357 | should_add_module("mc2" ADD_MC2) | 357 | should_add_module("mc2" ADD_MC2) |
| 358 | - if(ADD_MC2 AND NOT (ASCEND_COMPUTE_UNIT STREQUAL "ascend5162a")) | 358 | + if(ADD_MC2 AND NOT (ASCEND_COMPUTE_UNIT STREQUAL "ascend5162")) |
| 359 | add_subdirectory(mc2) | 359 | add_subdirectory(mc2) |
| 360 | endif() | 360 | endif() |
| 361 | should_add_module("posembedding" ADD_POSEMBEDDING) | 361 | should_add_module("posembedding" ADD_POSEMBEDDING) |
| @@ -53,7 +53,7 @@ ASCEND_SOC_UNITS="ascend910b" | |||
| 53 | SOC_USER_SPECIFIED=false | 53 | SOC_USER_SPECIFIED=false |
| 54 | # 支持的 SoC 列表(校验用, 单一数据源): 取自 cmake/scripts/util/const_var.py 的 SOC_MAP_EXT keys(出包遍历的 kernel 编译 soc 集合) | 54 | # 支持的 SoC 列表(校验用, 单一数据源): 取自 cmake/scripts/util/const_var.py 的 SOC_MAP_EXT keys(出包遍历的 kernel 编译 soc 集合) |
| 55 | # + CMakeLists.txt SOC_VERSION_LIST 中的 mc62。不在 CMakeLists.txt SOC_VERSION_LIST 的 soc 会走空包(cpack_empty_package) | 55 | # + CMakeLists.txt SOC_VERSION_LIST 中的 mc62。不在 CMakeLists.txt SOC_VERSION_LIST 的 soc 会走空包(cpack_empty_package) |
| 56 | -SUPPORT_COMPUTE_UNIT_SHORT=("ascend910b" "ascend910_93" "ascend950" "ascend960dt" "ascend960pr" "ascend350" "ascend310p" "ascend310b" "ascend910" "ascend610lite" "kirinx90" "kirin9030" "mc62" "ascend5162a") | 56 | +SUPPORT_COMPUTE_UNIT_SHORT=("ascend910b" "ascend910_93" "ascend950" "ascend960dt" "ascend960pr" "ascend350" "ascend310p" "ascend310b" "ascend910" "ascend610lite" "kirinx90" "kirin9030" "mc62" "ascend5162") |
| 57 | CMAKE_BUILD_MODE="" | 57 | CMAKE_BUILD_MODE="" |
| 58 | BUILD_TYPE="" | 58 | BUILD_TYPE="" |
| 59 | VERSION="" | 59 | VERSION="" |
| @@ -276,7 +276,7 @@ function(op_add_subdirectory OP_LIST OP_DIR_LIST) | |||
| 276 | if(NOT (ASCEND_COMPUTE_UNIT STREQUAL "kirinx90" OR | 276 | if(NOT (ASCEND_COMPUTE_UNIT STREQUAL "kirinx90" OR |
| 277 | ASCEND_COMPUTE_UNIT STREQUAL "kirin9030" OR | 277 | ASCEND_COMPUTE_UNIT STREQUAL "kirin9030" OR |
| 278 | ASCEND_COMPUTE_UNIT STREQUAL "mc62" OR | 278 | ASCEND_COMPUTE_UNIT STREQUAL "mc62" OR |
| 279 | - ASCEND_COMPUTE_UNIT STREQUAL "ascend5162a")) | 279 | + ASCEND_COMPUTE_UNIT STREQUAL "ascend5162")) |
| 280 | file(GLOB MC2_CANNDEV_OPS_HOST_CMAKE_FILES | 280 | file(GLOB MC2_CANNDEV_OPS_HOST_CMAKE_FILES |
| 281 | "${CMAKE_CURRENT_SOURCE_DIR}/mc2/**/op_host/CMakeLists.txt" | 281 | "${CMAKE_CURRENT_SOURCE_DIR}/mc2/**/op_host/CMakeLists.txt" |
| 282 | "${CMAKE_CURRENT_SOURCE_DIR}/mc2/**/framework/CMakeLists.txt" | 282 | "${CMAKE_CURRENT_SOURCE_DIR}/mc2/**/framework/CMakeLists.txt" |
| @@ -51,7 +51,7 @@ LONG_SOC = { | |||
| 51 | "kirinx90": "KirinX90", | 51 | "kirinx90": "KirinX90", |
| 52 | "kirin9030": "Kirin9030", | 52 | "kirin9030": "Kirin9030", |
| 53 | "mc62": "", | 53 | "mc62": "", |
| 54 | - "ascend5162a": "Ascend5162A", | 54 | + "ascend5162": "Ascend5162A", |
| 55 | "ascend610lite": "Ascend610Lite", | 55 | "ascend610lite": "Ascend610Lite", |
| 56 | } | 56 | } |
| 57 | _WHITELIST_CACHE = None | 57 | _WHITELIST_CACHE = None |
| @@ -35,7 +35,7 @@ SOC_MAP_EXT = { | |||
| 35 | "kirinx90": "KirinX90", | 35 | "kirinx90": "KirinX90", |
| 36 | "kirin9030": "Kirin9030", | 36 | "kirin9030": "Kirin9030", |
| 37 | "ascend350": "Ascend350_355e", | 37 | "ascend350": "Ascend350_355e", |
| 38 | - "ascend5162a": "Ascend5162A", | 38 | + "ascend5162": "Ascend5162A", |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | CHECK_ASC_DEVKIT_VERSION = False | 41 | CHECK_ASC_DEVKIT_VERSION = False |
| @@ -48,7 +48,7 @@ SOC_TO_SHORT_SOC_MAP = { | |||
| 48 | "ascend960dt_968b7": "ascend960dt", | 48 | "ascend960dt_968b7": "ascend960dt", |
| 49 | "ascend960pr_969a1": "ascend960pr", | 49 | "ascend960pr_969a1": "ascend960pr", |
| 50 | "ascend350_355e": "ascend350", | 50 | "ascend350_355e": "ascend350", |
| 51 | - "ascend5162a": "ascend5162a", | 51 | + "ascend5162a": "ascend5162", |
| 52 | } | 52 | } |
| 53 | CONFLICT_KEYWORDS = { | 53 | CONFLICT_KEYWORDS = { |
| 54 | "and", | 54 | "and", |
| @@ -34,7 +34,7 @@ SOC_MAP_EXT = { | |||
| 34 | "ascend910_93": "Ascend910_9391", | 34 | "ascend910_93": "Ascend910_9391", |
| 35 | "kirinx90": "KirinX90", | 35 | "kirinx90": "KirinX90", |
| 36 | "kirin9030": "Kirin9030", | 36 | "kirin9030": "Kirin9030", |
| 37 | - "ascend5162a": "Ascend5162A", | 37 | + "ascend5162": "Ascend5162A", |
| 38 | } | 38 | } |
| 39 | BIN_CMD = "asc_opc $1 --main_func={fun} --input_param={param} --soc_version={soc} \ | 39 | BIN_CMD = "asc_opc $1 --main_func={fun} --input_param={param} --soc_version={soc} \ |
| 40 | --output=$2 --impl_mode={impl} --simplified_key_mode=0 --op_mode=dynamic\n" | 40 | --output=$2 --impl_mode={impl} --simplified_key_mode=0 --op_mode=dynamic\n" |