已合并
【描 述】 eigen update to 5.0.0 #985
jialimin1创建于 1月28日
【描 述】 eigen update to 5.0.0 #985
已合并
jialimin1创建于 1月28日
4 个文件变更+10-8
MSECURITY.md+1-1
@@ -29,7 +29,7 @@
29| 依赖 | 不涉及 | cmake/third_party/makeself-fetch.cmake | https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz | 从gitcode下载makeself源码,作用编译依赖 |29| 依赖 | 不涉及 | cmake/third_party/makeself-fetch.cmake | https://gitcode.com/cann-src-third-party/makeself/releases/download/release-2.5.0-patch1.0/makeself-release-2.5.0-patch1.tar.gz | 从gitcode下载makeself源码,作用编译依赖 |
30| 依赖 | 不涉及 | cmake/third_party/json.cmake | https://gitcode.com/cann-src-third-party/json/releases/download/v3.11.3/include.zip | 从gitcode下载json源码,作用编译依赖 |30| 依赖 | 不涉及 | cmake/third_party/json.cmake | https://gitcode.com/cann-src-third-party/json/releases/download/v3.11.3/include.zip | 从gitcode下载json源码,作用编译依赖 |
31| 依赖 | 不涉及 | cmake/third_party/gtest.cmake | https://gitcode.com/cann-src-third-party/googletest/releases/download/v1.14.0/googletest-1.14.0.tar.gz | 从gitcode下载googletest源码,作用编译依赖 |31| 依赖 | 不涉及 | cmake/third_party/gtest.cmake | https://gitcode.com/cann-src-third-party/googletest/releases/download/v1.14.0/googletest-1.14.0.tar.gz | 从gitcode下载googletest源码,作用编译依赖 |
32-| 依赖 | 不涉及 | cmake/third_party/eigen.cmake | https://gitcode.com/cann-src-third-party/eigen/releases/download/3.4.0/eigen-3.4.0.tar.gz | 从gitcode下载eigen源码,作用编译依赖 |32+| 依赖 | 不涉及 | cmake/third_party/eigen.cmake | https://gitcode.com/cann-src-third-party/eigen/releases/download/5.0.0/eigen-5.0.0.tar.gz | 从gitcode下载eigen源码,作用编译依赖 |
33---33---
34 34 
35## 漏洞机制说明35## 漏洞机制说明
MThird_Party_Open_Source_Software_List.yaml+1-1
@@ -1,5 +1,5 @@
1eigen:1eigen:
2- version: 3.4.02+ version: 5.0.0
3 type: run3 type: run
4googletest:4googletest:
5 version: v1.14.05 version: v1.14.0
Mcmake/third_party/eigen.cmake+7-5
@@ -10,7 +10,7 @@
10if(POLICY CMP0135)10if(POLICY CMP0135)
11 cmake_policy(SET CMP0135 NEW)11 cmake_policy(SET CMP0135 NEW)
12endif()12endif()
13-set(EIGEN_VERSION_PKG eigen-3.4.0.tar.gz)13+set(EIGEN_VERSION_PKG eigen-5.0.0.tar.gz)
14 14 
15unset(eigen_FOUND CACHE)15unset(eigen_FOUND CACHE)
16unset(EIGEN_INCLUDE CACHE)16unset(EIGEN_INCLUDE CACHE)
@@ -19,7 +19,9 @@ find_path(EIGEN_INCLUDE
19 NAMES Eigen/Eigen19 NAMES Eigen/Eigen
20 NO_CMAKE_SYSTEM_PATH20 NO_CMAKE_SYSTEM_PATH
21 NO_CMAKE_FIND_ROOT_PATH21 NO_CMAKE_FIND_ROOT_PATH
22- PATHS ${CANN_3RD_LIB_PATH}/eigen)22+ PATHS
23+ ${CANN_3RD_LIB_PATH}/eigen-5.0.0
24+ ${CANN_3RD_LIB_PATH}/eigen)
23 25 
24include(FindPackageHandleStandardArgs)26include(FindPackageHandleStandardArgs)
25find_package_handle_standard_args(eigen27find_package_handle_standard_args(eigen
@@ -30,12 +32,12 @@ find_package_handle_standard_args(eigen
30 )32 )
31 33 
32if(eigen_FOUND)34if(eigen_FOUND)
33- message(STATUS "Found eigen in ${CANN_3RD_LIB_PATH}/eigen")35+ message(STATUS "Found eigen in ${EIGEN_INCLUDE}")
34else()36else()
35 if(EXISTS "${CANN_3RD_LIB_PATH}/pkg/${EIGEN_VERSION_PKG}")37 if(EXISTS "${CANN_3RD_LIB_PATH}/pkg/${EIGEN_VERSION_PKG}")
36- set(REQ_URL "file://${CANN_3RD_LIB_PATH}/pkg/${EIGEN_VERSION_PKG}")38+ set(REQ_URL "${CANN_3RD_LIB_PATH}/pkg/${EIGEN_VERSION_PKG}")
37 else()39 else()
38- set(REQ_URL "https://gitcode.com/cann-src-third-party/eigen/releases/download/3.4.0/${EIGEN_VERSION_PKG}")40+ set(REQ_URL "https://gitcode.com/cann-src-third-party/eigen/releases/download/5.0.0/${EIGEN_VERSION_PKG}")
39 endif()41 endif()
40 42 
41 include(ExternalProject)43 include(ExternalProject)
Mdocs/zh/context/build_offline.md+1-1
@@ -16,7 +16,7 @@
16 16 
17- 依赖eigen17- 依赖eigen
18 18 
19-下载[eigen](https://gitcode.com/cann-src-third-party/eigen/releases/download/3.4.0/eigen-3.4.0.tar.gz),并解压到```${cann_3rd_lib_path}/```目录下,再将解压后的`eigen-3.4.0`目录重命名为`eigen`。19+下载[eigen](https://gitcode.com/cann-src-third-party/eigen/releases/download/5.0.0/eigen-5.0.0.tar.gz),并解压到```${cann_3rd_lib_path}/```目录下,再将解压后的`eigen-5.0.0`目录重命名为`eigen`。
20 20 
21- 依赖protobuf21- 依赖protobuf
22 22