已合并
【feat】: 升级cann-cmake至master-044，切换add_cann_sign_file/add_cann_device_project公共函数 #4161
yelongjian创建于 7月28日
【feat】: 升级cann-cmake至master-044，切换add_cann_sign_file/add_cann_device_project公共函数 #4161
已合并
共 5 个文件变更+8-27
| @@ -576,30 +576,8 @@ elseif (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC) | |||
| 576 | add_dependencies(dflow-executor version_dflow-executor_info) | 576 | add_dependencies(dflow-executor version_dflow-executor_info) |
| 577 | if (ENABLE_BUILD_DEVICE) | 577 | if (ENABLE_BUILD_DEVICE) |
| 578 | cmake_print_variables(ENABLE_SIGN CUSTOM_SIGN_SCRIPT) | 578 | cmake_print_variables(ENABLE_SIGN CUSTOM_SIGN_SCRIPT) |
| 579 | - include(ExternalProject) | 579 | + add_cann_device_project(dflow-executor) |
| 580 | - ExternalProject_Add(udf_device | 580 | + add_dependencies(dflow-executor cann_device) |
| 581 | - SOURCE_DIR ${CMAKE_SOURCE_DIR}/cmake/device | ||
| 582 | - BINARY_DIR ${CMAKE_BINARY_DIR}/device_build | ||
| 583 | - CMAKE_ARGS | ||
| 584 | - -DTOOLCHAIN_DIR=${ASCEND_INSTALL_PATH}/toolkit/toolchain/hcc | ||
| 585 | - -DCMAKE_TOOLCHAIN_FILE=${CANN_CMAKE_DIR}/toolchain/aarch64-hcc-toolchain.cmake | ||
| 586 | - -DCANN_3RD_LIB_PATH=${CANN_3RD_LIB_PATH} | ||
| 587 | - -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} | ||
| 588 | - -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} | ||
| 589 | - -DINSTALL_LIBRARY_DIR=${INSTALL_LIBRARY_DIR} | ||
| 590 | - -DASCEND_INSTALL_PATH=${ASCEND_INSTALL_PATH} | ||
| 591 | - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} | ||
| 592 | - -DHI_PYTHON=${HI_PYTHON} | ||
| 593 | - -DENABLE_SIGN=${ENABLE_SIGN} | ||
| 594 | - -DCUSTOM_SIGN_SCRIPT=${CUSTOM_SIGN_SCRIPT} | ||
| 595 | - -DVERSION_INFO=${VERSION_INFO} | ||
| 596 | - INSTALL_COMMAND ${CMAKE_CPACK_COMMAND} | ||
| 597 | - BUILD_ALWAYS TRUE) | ||
| 598 | - install(FILES | ||
| 599 | - ${CMAKE_BINARY_DIR}/device_build/device-dflow-executor.tar.gz | ||
| 600 | - DESTINATION . | ||
| 601 | - COMPONENT dflow-executor) | ||
| 602 | - add_dependencies(dflow-executor udf_device) | ||
| 603 | endif () | 581 | endif () |
| 604 | endif() | 582 | endif() |
| 605 | include(cmake/package.cmake) | 583 | include(cmake/package.cmake) |
| @@ -455,7 +455,6 @@ build_single_pkg() { | |||
| 455 | -D CMAKE_FIND_DEBUG_MODE=OFF \ | 455 | -D CMAKE_FIND_DEBUG_MODE=OFF \ |
| 456 | -D ENABLE_SIGN=${ENABLE_SIGN} \ | 456 | -D ENABLE_SIGN=${ENABLE_SIGN} \ |
| 457 | -D CUSTOM_SIGN_SCRIPT=${CUSTOM_SIGN_SCRIPT} \ | 457 | -D CUSTOM_SIGN_SCRIPT=${CUSTOM_SIGN_SCRIPT} \ |
| 458 | - -D VERSION_INFO=${VERSION_INFO} \ | ||
| 459 | -D PACKAGE_TYPE=${PACKAGE_TYPE} \ | 458 | -D PACKAGE_TYPE=${PACKAGE_TYPE} \ |
| 460 | -D ENABLE_BUILD_DEVICE=${ENABLE_BUILD_DEVICE} \ | 459 | -D ENABLE_BUILD_DEVICE=${ENABLE_BUILD_DEVICE} \ |
| 461 | -D USE_CXX11_ABI=${USE_CXX11_ABI} \ | 460 | -D USE_CXX11_ABI=${USE_CXX11_ABI} \ |
| @@ -25,6 +25,8 @@ set(CMAKE_CXX_STANDARD 17) | |||
| 25 | set(CMAKE_SKIP_BUILD_RPATH TRUE) | 25 | set(CMAKE_SKIP_BUILD_RPATH TRUE) |
| 26 | set(CMAKE_SKIP_INSTALL_RPATH TRUE) | 26 | set(CMAKE_SKIP_INSTALL_RPATH TRUE) |
| 27 | 27 | ||
| 28 | +include(${GE_DIR}/version.cmake) | ||
| 29 | + | ||
| 28 | add_subdirectory(../../dflow/udf/cmake/device dflow/udf/cmake/device) | 30 | add_subdirectory(../../dflow/udf/cmake/device dflow/udf/cmake/device) |
| 29 | 31 | ||
| 30 | set_cann_subprj_package() | 32 | set_cann_subprj_package() |
| @@ -13,8 +13,8 @@ if(NOT PROJECT_SOURCE_DIR) | |||
| 13 | else() | 13 | else() |
| 14 | include(FetchContent) | 14 | include(FetchContent) |
| 15 | 15 | ||
| 16 | - set(CANN_CMAKE_TAG "master-042") # CANN_CMAKE_TAG变量会在scripts/download_third_party_source.sh中用到，确保这个变量存在 | 16 | + set(CANN_CMAKE_TAG "master-044") # CANN_CMAKE_TAG变量会在scripts/download_third_party_source.sh中用到，确保这个变量存在 |
| 17 | - set(CANN_CMAKE_SHA256 "8482467199ba9667b3eb74f38275773944c84c9e5a37ecde1863e5ee4182fe87") | 17 | + set(CANN_CMAKE_SHA256 "2d8827b33327978c7b49d09e3b1cfbd891b41b7b5123c290d41534d29a625056") |
| 18 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") | 18 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") |
| 19 | FetchContent_Declare( | 19 | FetchContent_Declare( |
| 20 | cann-cmake | 20 | cann-cmake |
| @@ -66,6 +66,7 @@ if (ENABLE_SIGN) | |||
| 66 | INPUT "${CMAKE_BINARY_DIR}/${PACKAGE_TAR_FILE_NAME}" | 66 | INPUT "${CMAKE_BINARY_DIR}/${PACKAGE_TAR_FILE_NAME}" |
| 67 | CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/sign/sign.xml | 67 | CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/sign/sign.xml |
| 68 | RESULT_VAR "udf_compat_sign_file" | 68 | RESULT_VAR "udf_compat_sign_file" |
| 69 | + VERSION "${CANN_VERSION_dflow-executor_VERSION}" | ||
| 69 | DEPENDS pack_udf_compat | 70 | DEPENDS pack_udf_compat |
| 70 | ) | 71 | ) |
| 71 | 72 | ||
| @@ -134,6 +135,7 @@ if (ENABLE_SIGN) | |||
| 134 | INPUT "${CMAKE_BINARY_DIR}/${RUNTIME_PACKAGE_TAR_FILE_NAME}" | 135 | INPUT "${CMAKE_BINARY_DIR}/${RUNTIME_PACKAGE_TAR_FILE_NAME}" |
| 135 | CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/sign/runtime_dev_sign.xml | 136 | CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/sign/runtime_dev_sign.xml |
| 136 | RESULT_VAR "runtime_device_sign_file" | 137 | RESULT_VAR "runtime_device_sign_file" |
| 138 | + VERSION "${CANN_VERSION_dflow-executor_VERSION}" | ||
| 137 | DEPENDS pack_runtime_device sign_cann_udf_compat | 139 | DEPENDS pack_runtime_device sign_cann_udf_compat |
| 138 | ) | 140 | ) |
| 139 | 141 | ||