已合并
cann-cmake 依赖版本从 master-033 升级至 master-044 #1156
Ding_Jing创建于 7月23日
cann-cmake 依赖版本从 master-033 升级至 master-044 #1156
已合并
共 4 个文件变更+5-5
| @@ -31,7 +31,7 @@ | |||
| 31 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [json-3.11.3.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/json/json-3.11.3.tar.gz) | 从OBS下载json源码，作用编译依赖 | | 31 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [json-3.11.3.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/json/json-3.11.3.tar.gz) | 从OBS下载json源码，作用编译依赖 | |
| 32 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [googletest-1.14.0.tar.gz](https://gitcode.com/cann-src-third-party/googletest/releases/download/v1.14.0/googletest-1.14.0.tar.gz) | 从gitcode下载googletest源码，作用编译依赖 | | 32 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [googletest-1.14.0.tar.gz](https://gitcode.com/cann-src-third-party/googletest/releases/download/v1.14.0/googletest-1.14.0.tar.gz) | 从gitcode下载googletest源码，作用编译依赖 | |
| 33 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [eigen-5.0.0.tar.gz](https://gitcode.com/cann-src-third-party/eigen/releases/download/5.0.0-h0.trunk/eigen-5.0.0.tar.gz) | 从gitcode下载eigen源码，作用编译依赖 | | 33 | | 依赖 | 不涉及 | scripts/tools/third_lib_download.py | [eigen-5.0.0.tar.gz](https://gitcode.com/cann-src-third-party/eigen/releases/download/5.0.0-h0.trunk/eigen-5.0.0.tar.gz) | 从gitcode下载eigen源码，作用编译依赖 | |
| 34 | -| 依赖 | 不涉及 | cmake/fetch_cann_cmake.cmake | [cmake-master-033.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-033.tar.gz) | 从OBS下载cann-cmake源码，作用编译依赖 | | 34 | +| 依赖 | 不涉及 | cmake/fetch_cann_cmake.cmake | [cmake-master-044.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-044.tar.gz) | 从OBS下载cann-cmake源码，作用编译依赖 | |
| 35 | 35 | ||
| 36 | --- | 36 | --- |
| 37 | 37 | ||
| @@ -16,12 +16,12 @@ if(NOT PROJECT_SOURCE_DIR) | |||
| 16 | else() | 16 | else() |
| 17 | include(FetchContent) | 17 | include(FetchContent) |
| 18 | 18 | ||
| 19 | - set(CANN_CMAKE_TAG "master-033") | 19 | + set(CANN_CMAKE_TAG "master-044") |
| 20 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") | 20 | if(CANN_3RD_LIB_PATH AND EXISTS "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz") |
| 21 | FetchContent_Declare( | 21 | FetchContent_Declare( |
| 22 | cann-cmake | 22 | cann-cmake |
| 23 | URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz" | 23 | URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz" |
| 24 | - URL_HASH SHA256=82c08ae7df8bf291321f33b0c6c0b3e6ff328ba945984960df3c65d07bff9d8c | 24 | + URL_HASH SHA256=2d8827b33327978c7b49d09e3b1cfbd891b41b7b5123c290d41534d29a625056 |
| 25 | ) | 25 | ) |
| 26 | else() | 26 | else() |
| 27 | FetchContent_Declare( | 27 | FetchContent_Declare( |
| @@ -16,7 +16,7 @@ | |||
| 16 | | protobuf | 25.1.0 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | | 16 | | protobuf | 25.1.0 | [protobuf-25.1.tar.gz](https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz) | |
| 17 | | abseil-cpp | 20230802.1 | [abseil-cpp-20230802.1.tar.gz](https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/20230802.1/abseil-cpp-20230802.1.tar.gz) | | 17 | | abseil-cpp | 20230802.1 | [abseil-cpp-20230802.1.tar.gz](https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/20230802.1/abseil-cpp-20230802.1.tar.gz) | |
| 18 | | opbase(自CANN 9.0.0及以后版本需要下载) | master | [opbase](https://gitcode.com/cann/opbase) | | 18 | | opbase(自CANN 9.0.0及以后版本需要下载) | master | [opbase](https://gitcode.com/cann/opbase) | |
| 19 | -| cann-cmake | master-033 | [cmake-master-033.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-033.tar.gz) | | 19 | +| cann-cmake | master-044 | [cmake-master-044.tar.gz](https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-044.tar.gz) | |
| 20 | 20 | ||
| 21 | 若您的编译环境可以访问网络，请参考[联网编译](#联网编译)，编译脚本会自动联网下载第三方软件。否则，请参考[未联网编译](#未联网编译)手动下载第三方软件。 | 21 | 若您的编译环境可以访问网络，请参考[联网编译](#联网编译)，编译脚本会自动联网下载第三方软件。否则，请参考[未联网编译](#未联网编译)手动下载第三方软件。 |
| 22 | 22 | ||
| @@ -156,7 +156,7 @@ if __name__ == "__main__": | |||
| 156 | "https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz", | 156 | "https://gitcode.com/cann-src-third-party/protobuf/releases/download/v25.1/protobuf-25.1.tar.gz", |
| 157 | ("https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/" | 157 | ("https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/" |
| 158 | "20230802.1/abseil-cpp-20230802.1.tar.gz"), | 158 | "20230802.1/abseil-cpp-20230802.1.tar.gz"), |
| 159 | - "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-033.tar.gz", | 159 | + "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/cmake/cmake-master-044.tar.gz", |
| 160 | "https://gitcode.com/cann/opbase.git" # Git 仓库 | 160 | "https://gitcode.com/cann/opbase.git" # Git 仓库 |
| 161 | ] | 161 | ] |
| 162 | 162 | ||