Merged
feat(ccu): 随 run 包交付 asccomm-config.cmake #7287
DragonBornHD84Add on 16 days ago
feat(ccu): 随 run 包交付 asccomm-config.cmake #7287
Merged
Merged fromDragonBornHD84/asc-devkitdevintocann/asc-devkitmaster
Total: 2 files changed+7-1
| @@ -9,7 +9,7 @@ | |||
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | 10 | ||
| 11 | # 后续如果更新asc-comm代码需要同步更新至devkit run包需要更新change id | 11 | # 后续如果更新asc-comm代码需要同步更新至devkit run包需要更新change id |
| 12 | -set(ASC_COMM_TAG_ID 9a65345c719bfe73d0c4ae61c221a4d1defb93d4) | 12 | +set(ASC_COMM_TAG_ID 4e5cc2603f195cdff9b3ca5bdd7ac0a3395ed803) |
| 13 | 13 | ||
| 14 | # asc-comm 与 asc-devkit 按同级目录放置。路径以本文件所在目录(<devkit>/cmake/third_party)为锚, | 14 | # asc-comm 与 asc-devkit 按同级目录放置。路径以本文件所在目录(<devkit>/cmake/third_party)为锚, |
| 15 | # 对于CI环境已经存在asc-comm代码, 不去拉取代码否则使用submodule方式拉取asc-comm仓代码 | 15 | # 对于CI环境已经存在asc-comm代码, 不去拉取代码否则使用submodule方式拉取asc-comm仓代码 |
| @@ -137,6 +137,9 @@ if(EXISTS "${ASC_COMM_CCU_CMAKE_DIR}/CMakeLists.txt") | |||
| 137 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/include/comm_api/ccu/hcomm | 137 | DESTINATION ${INSTALL_LIBRARY_DIR}/asc/include/comm_api/ccu/hcomm |
| 138 | COMPONENT asc-devkit | 138 | COMPONENT asc-devkit |
| 139 | FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") | 139 | FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") |
| 140 | + install(FILES ${ASC_COMM_SOURCE_PATH}/cmake/asccomm-config.cmake | ||
| 141 | + DESTINATION ${INSTALL_LIBRARY_DIR}/lib64/cmake | ||
| 142 | + COMPONENT asc-devkit) | ||
| 140 | endif() | 143 | endif() |
| 141 | 144 | ||
| 142 | # ccu_runtime 是 asc-comm 的编译器侧 CCU runtime;作为 asc-devkit 子目录构建时, | 145 | # ccu_runtime 是 asc-comm 的编译器侧 CCU runtime;作为 asc-devkit 子目录构建时, |
| @@ -227,6 +227,9 @@ | |||
| 227 | <file value="aicpu-config.cmake" install_softlink="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/aicpu-config.cmake"/> | 227 | <file value="aicpu-config.cmake" install_softlink="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/aicpu-config.cmake"/> |
| 228 | <file value="asc-config.cmake" install_softlink="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/asc-config.cmake"/> | 228 | <file value="asc-config.cmake" install_softlink="$(TARGET_ENV)/tikcpp/ascendc_kernel_cmake/asc-config.cmake"/> |
| 229 | </file_info> | 229 | </file_info> |
| 230 | + <file_info value="asccomm_config" copy_type="delivery" src_path="lib/host" dst_path="$(TARGET_ENV)/lib64/cmake" install_path="$(TARGET_ENV)/lib64/cmake" install_type="all" install_mod="440"> | ||
| 231 | + <file value="asccomm-config.cmake"/> | ||
| 232 | + </file_info> | ||
| 230 | <file_info value="acl_rt" copy_type="delivery" src_path="lib/host" dst_path="$(TARGET_ENV)/include/acl" install_path="$(TARGET_ENV)/include/acl" install_mod="440"> | 233 | <file_info value="acl_rt" copy_type="delivery" src_path="lib/host" dst_path="$(TARGET_ENV)/include/acl" install_path="$(TARGET_ENV)/include/acl" install_mod="440"> |
| 231 | <file value="acl_rt_compile.h"/> | 234 | <file value="acl_rt_compile.h"/> |
| 232 | </file_info> | 235 | </file_info> |
🟡 Medium Priority
变更行:新增
install(FILES ${ASC_COMM_SOURCE_PATH}/cmake/asccomm-config.cmake DESTINATION ${INSTALL_LIBRARY_DIR}/lib64/cmake COMPONENT asc-devkit),被安装的配置文件来自 asc-comm 仓库(非本仓库),且未做存在性判断。契约/一致性证据:
ASC_COMM_TAG_ID 9a65345c...(本次 diff 未更新),第 11 行注释明确“更新 asc-comm 代码需同步更新 change id”。当环境未预置 asc-comm 源码、走第 44-51 行FetchContent回退路径时,拉取到的是旧 tag 的源码树,其中不含新文件cmake/asccomm-config.cmake。if(EXISTS "${ASC_COMM_AICPU_HEADER_DIR}")、第 119/162 行if(EXISTS ".../CMakeLists.txt")。cmake/CMakeLists.txt:26-31安装aicpu-config.cmake/asc-config.cmake)在DESTINATION后都带有${INSTALL_OPTIONAL};本条缺失,使得“源文件不存在”从“跳过该文件”退化为硬失败。失败模式:
install(FILES <不存在路径>)会在 CMake 生成/安装阶段报file INSTALL cannot find ".../cmake/asccomm-config.cmake",导致cmake --install(以及整包 staging)直接中断——即 asc-devkit run 包在 asc-comm 源码未包含该文件的所有构建配置下都无法产包,而不是仅缺失一个 cmake config。建议:用 if(EXISTS ...) 包裹该 install(FILES ...) 规则(或加 ${INSTALL_OPTIONAL}),并同步把 ASC_COMM_TAG_ID 更新到包含 cmake/asccomm-config.cmake 的 asc-comm 提交。