unify the patch path & update makeself hash-cmake-AtomGit

Mthird_party/abseil-cpp.cmake+6-7

	@@ -16,10 +16,10 @@ set(ABSEIL_VERSION_PKG abseil-cpp-20230802.1.tar.gz)
16		16
17	if(PRODUCT_SIDE STREQUAL "device")	17	if(PRODUCT_SIDE STREQUAL "device")
18	set(ABS_INSTALL_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/abseil-cpp CACHE INTERNAL "abseil cpp install dir")	18	set(ABS_INSTALL_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/abseil-cpp CACHE INTERNAL "abseil cpp install dir")
19	- set(ABS_PKG_DIR ${CANN_3RD_LIB_PATH}/pkg/device CACHE INTERNAL "abseil cpp pkg dir")	19	+ set(ABS_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch/device CACHE INTERNAL "abseil cpp patch dir")
20	else()	20	else()
21	set(ABS_INSTALL_DIR ${CANN_3RD_LIB_PATH}/lib_cache/abseil-cpp CACHE INTERNAL "abseil cpp install dir")	21	set(ABS_INSTALL_DIR ${CANN_3RD_LIB_PATH}/lib_cache/abseil-cpp CACHE INTERNAL "abseil cpp install dir")
22	- set(ABS_PKG_DIR ${CANN_3RD_LIB_PATH}/pkg CACHE INTERNAL "abseil cpp pkg dir")	22	+ set(ABS_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch CACHE INTERNAL "abseil cpp patch dir")
23	endif()	23	endif()
24		24
25	# use for online pipeline building acceleration	25	# use for online pipeline building acceleration
	@@ -58,16 +58,16 @@ else()
58	if(EXISTS ${CANN_3RD_LIB_PATH}/abseil-cpp/backport-CVE-2025-0838.patch)	58	if(EXISTS ${CANN_3RD_LIB_PATH}/abseil-cpp/backport-CVE-2025-0838.patch)
59	set(ABSL_CVE_PATCH_FILE ${CANN_3RD_LIB_PATH}/abseil-cpp/backport-CVE-2025-0838.patch)	59	set(ABSL_CVE_PATCH_FILE ${CANN_3RD_LIB_PATH}/abseil-cpp/backport-CVE-2025-0838.patch)
60	add_custom_target(abseil_cve_patch)	60	add_custom_target(abseil_cve_patch)
61	- elseif(EXISTS ${ABS_PKG_DIR}/backport-CVE-2025-0838.patch)	61	+ elseif(EXISTS ${ABS_PATCH_PATH}/backport-CVE-2025-0838.patch)
62	- set(ABSL_CVE_PATCH_FILE ${ABS_PKG_DIR}/backport-CVE-2025-0838.patch)	62	+ set(ABSL_CVE_PATCH_FILE ${ABS_PATCH_PATH}/backport-CVE-2025-0838.patch)
63	add_custom_target(abseil_cve_patch)	63	add_custom_target(abseil_cve_patch)
64	else()	64	else()
65	# 路径不能与 abseil 源码目录相同,构建时会清理	65	# 路径不能与 abseil 源码目录相同,构建时会清理
66	- set(ABSL_CVE_PATCH_FILE ${ABS_PKG_DIR}/backport-CVE-2025-0838.patch)	66	+ set(ABSL_CVE_PATCH_FILE ${ABS_PATCH_PATH}/backport-CVE-2025-0838.patch)
67	ExternalProject_Add(abseil_cve_patch	67	ExternalProject_Add(abseil_cve_patch
68	URL "https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/20230802.1-h0/backport-CVE-2025-0838.patch"	68	URL "https://gitcode.com/cann-src-third-party/abseil-cpp/releases/download/20230802.1-h0/backport-CVE-2025-0838.patch"
69	URL_HASH SHA256=a4e4ef6fc4f4c1ed871a3472c5e650068aaadaad2adfef2c8ccb00918bb36d8c	69	URL_HASH SHA256=a4e4ef6fc4f4c1ed871a3472c5e650068aaadaad2adfef2c8ccb00918bb36d8c
70	- DOWNLOAD_DIR ${ABS_PKG_DIR}	70	+ DOWNLOAD_DIR ${ABS_PATCH_PATH}
71	DOWNLOAD_NO_EXTRACT TRUE	71	DOWNLOAD_NO_EXTRACT TRUE
72	DOWNLOAD_NO_PROGRESS TRUE	72	DOWNLOAD_NO_PROGRESS TRUE
73	TIMEOUT 60	73	TIMEOUT 60
	@@ -86,7 +86,6 @@ else()
86	ExternalProject_Add(abseil_build	86	ExternalProject_Add(abseil_build
87	URL ${REQ_URL}	87	URL ${REQ_URL}
88	URL_HASH SHA256=987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed	88	URL_HASH SHA256=987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed
89	- DOWNLOAD_DIR ${ABS_PKG_DIR}
90	SOURCE_DIR ${ABS_INSTALL_DIR}	89	SOURCE_DIR ${ABS_INSTALL_DIR}
91	TIMEOUT 300	90	TIMEOUT 300
92	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 < ${CMAKE_CURRENT_LIST_DIR}/patch/protobuf-hide_absl_symbols.patch && patch --forward --batch --quiet -r - -p1 < ${ABSL_CVE_PATCH_FILE} && patch --forward --batch --quiet -r - -p1 < ${CMAKE_CURRENT_LIST_DIR}/patch/fix-gcc15-gcc16-container-memory-cstdint.patch	91	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 < ${CMAKE_CURRENT_LIST_DIR}/patch/protobuf-hide_absl_symbols.patch && patch --forward --batch --quiet -r - -p1 < ${ABSL_CVE_PATCH_FILE} && patch --forward --batch --quiet -r - -p1 < ${CMAKE_CURRENT_LIST_DIR}/patch/fix-gcc15-gcc16-container-memory-cstdint.patch

Mthird_party/llvm.cmake+9-8

	@@ -36,6 +36,7 @@ set(LLVM_SOURCE_PATH ${CANN_3RD_LIB_PATH}/llvm-19)
36	set(LLVM_INSTALL_PATH ${CANN_3RD_LIB_PATH}/lib_cache/llvm_${LLVM_PROJECT_VERSION})	36	set(LLVM_INSTALL_PATH ${CANN_3RD_LIB_PATH}/lib_cache/llvm_${LLVM_PROJECT_VERSION})
37	set(LLVM_DOWNLOAD_PATH ${CANN_3RD_LIB_PATH}/pkg)	37	set(LLVM_DOWNLOAD_PATH ${CANN_3RD_LIB_PATH}/pkg)
38	set(LLVM_ARCHIVE ${LLVM_DOWNLOAD_PATH}/llvm-project-${LLVM_PROJECT_TAG}.tar.gz)	38	set(LLVM_ARCHIVE ${LLVM_DOWNLOAD_PATH}/llvm-project-${LLVM_PROJECT_TAG}.tar.gz)
		39	+set(LLVM_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch)
39		40
40	if(NOT CMAKE_FIND_LIBRARY_PREFIXES)	41	if(NOT CMAKE_FIND_LIBRARY_PREFIXES)
41	set(CMAKE_FIND_LIBRARY_PREFIXES "lib")	42	set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
	@@ -121,7 +122,7 @@ set(LLVM_VPTO_PATCH_READY FALSE)
121	if(NOT LLVM_SOURCE_HAS_VPTO)	122	if(NOT LLVM_SOURCE_HAS_VPTO)
122	foreach(_vpto_cand	123	foreach(_vpto_cand
123	${CANN_3RD_LIB_PATH}/feature-vpto-last3.patch	124	${CANN_3RD_LIB_PATH}/feature-vpto-last3.patch
124	- ${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch)	125	+ ${LLVM_PATCH_PATH}/feature-vpto-last3.patch)
125	if(EXISTS ${_vpto_cand})	126	if(EXISTS ${_vpto_cand})
126	set(LLVM_VPTO_PATCH_FILE ${_vpto_cand})	127	set(LLVM_VPTO_PATCH_FILE ${_vpto_cand})
127	set(LLVM_VPTO_PATCH_READY TRUE)	128	set(LLVM_VPTO_PATCH_READY TRUE)
	@@ -130,28 +131,28 @@ if(NOT LLVM_SOURCE_HAS_VPTO)
130	endif()	131	endif()
131	endforeach()	132	endforeach()
132	if(NOT LLVM_VPTO_PATCH_READY)	133	if(NOT LLVM_VPTO_PATCH_READY)
133	- message(STATUS "[ThirdParty][llvm] vpto patch not cached, downloading to: ${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch")	134	+ message(STATUS "[ThirdParty][llvm] vpto patch not cached, downloading to: ${LLVM_PATCH_PATH}/feature-vpto-last3.patch")
134	- file(MAKE_DIRECTORY ${LLVM_DOWNLOAD_PATH})	135	+ file(MAKE_DIRECTORY ${LLVM_PATCH_PATH})
135	# file(DOWNLOAD ... EXPECTED_HASH) hard-fails on any failed download	136	# file(DOWNLOAD ... EXPECTED_HASH) hard-fails on any failed download
136	# (the empty/partial target fails the hash check even with STATUS set),	137	# (the empty/partial target fails the hash check even with STATUS set),
137	# which would abort the configure in sandboxed environments. Download	138	# which would abort the configure in sandboxed environments. Download
138	# without a hash and verify afterwards.	139	# without a hash and verify afterwards.
139	- file(REMOVE "${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch")	140	+ file(REMOVE "${LLVM_PATCH_PATH}/feature-vpto-last3.patch")
140	file(DOWNLOAD	141	file(DOWNLOAD
141	"https://gitcode.com/cann-src-third-party/llvm/releases/download/19.1.7-h0/feature-vpto-last3.patch"	142	"https://gitcode.com/cann-src-third-party/llvm/releases/download/19.1.7-h0/feature-vpto-last3.patch"
142	- "${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch"	143	+ "${LLVM_PATCH_PATH}/feature-vpto-last3.patch"
143	TIMEOUT 60	144	TIMEOUT 60
144	STATUS LLVM_VPTO_DL_STATUS	145	STATUS LLVM_VPTO_DL_STATUS
145	)	146	)
146	list(GET LLVM_VPTO_DL_STATUS 0 LLVM_VPTO_DL_CODE)	147	list(GET LLVM_VPTO_DL_STATUS 0 LLVM_VPTO_DL_CODE)
147	- if(NOT LLVM_VPTO_DL_CODE EQUAL 0 OR NOT EXISTS "${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch")	148	+ if(NOT LLVM_VPTO_DL_CODE EQUAL 0 OR NOT EXISTS "${LLVM_PATCH_PATH}/feature-vpto-last3.patch")
148	# The source does not carry SimtEntry, so the patch is required;	149	# The source does not carry SimtEntry, so the patch is required;
149	# a failed download cannot be silently ignored.	150	# a failed download cannot be silently ignored.
150	message(FATAL_ERROR "[ThirdParty][llvm] vpto patch download failed (code ${LLVM_VPTO_DL_CODE}) and the LLVM source lacks SimtEntry; the patch is required for the PTOAS build")	151	message(FATAL_ERROR "[ThirdParty][llvm] vpto patch download failed (code ${LLVM_VPTO_DL_CODE}) and the LLVM source lacks SimtEntry; the patch is required for the PTOAS build")
151	endif()	152	endif()
152	- file(SHA256 "${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch" LLVM_VPTO_DL_SHA256)	153	+ file(SHA256 "${LLVM_PATCH_PATH}/feature-vpto-last3.patch" LLVM_VPTO_DL_SHA256)
153	if(LLVM_VPTO_DL_SHA256 STREQUAL "a49c1d3dd8ab78e93264712bc0d46deb536196a54abb2c2ee02abd914cd385e2")	154	if(LLVM_VPTO_DL_SHA256 STREQUAL "a49c1d3dd8ab78e93264712bc0d46deb536196a54abb2c2ee02abd914cd385e2")
154	- set(LLVM_VPTO_PATCH_FILE ${LLVM_DOWNLOAD_PATH}/feature-vpto-last3.patch)	155	+ set(LLVM_VPTO_PATCH_FILE ${LLVM_PATCH_PATH}/feature-vpto-last3.patch)
155	set(LLVM_VPTO_PATCH_READY TRUE)	156	set(LLVM_VPTO_PATCH_READY TRUE)
156	message(STATUS "[ThirdParty][llvm] vpto patch downloaded: ${LLVM_VPTO_PATCH_FILE}")	157	message(STATUS "[ThirdParty][llvm] vpto patch downloaded: ${LLVM_VPTO_PATCH_FILE}")
157	else()	158	else()

Mthird_party/makeself-fetch.cmake+7-7

	@@ -12,7 +12,7 @@ include_guard(GLOBAL)
12	set(MAKESELF_NAME "makeself")	12	set(MAKESELF_NAME "makeself")
13	set(MAKESELF_PATH "${CANN_3RD_LIB_PATH}/${MAKESELF_NAME}")	13	set(MAKESELF_PATH "${CANN_3RD_LIB_PATH}/${MAKESELF_NAME}")
14	set(MAKESELF_TAR_PATH "${CANN_3RD_LIB_PATH}/makeself-release-2.5.0.tar.gz")	14	set(MAKESELF_TAR_PATH "${CANN_3RD_LIB_PATH}/makeself-release-2.5.0.tar.gz")
15	-set(MAKESELF_PATCH_PATH "${CANN_3RD_LIB_PATH}/pkg/makeself-2.5.0.patch")	15	+set(MAKESELF_PATCH "${CANN_3RD_LIB_PATH}/patch/makeself-2.5.0.patch")
16	set(REQ_URL "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/makeself/makeself-release-2.5.0.tar.gz")	16	set(REQ_URL "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/makeself/makeself-release-2.5.0.tar.gz")
17	set(PATCH_REQ_URL "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/makeself/makeself-2.5.0.patch")	17	set(PATCH_REQ_URL "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/makeself/makeself-2.5.0.patch")
18		18
	@@ -20,13 +20,13 @@ set(PATCH_REQ_URL "https://cann-3rd.obs.cn-north-4.myhuaweicloud.com/makeself/ma
20	if (EXISTS "${MAKESELF_PATH}/makeself-header.sh" AND EXISTS "${MAKESELF_PATH}/makeself.sh")	20	if (EXISTS "${MAKESELF_PATH}/makeself-header.sh" AND EXISTS "${MAKESELF_PATH}/makeself.sh")
21	message(STATUS "[ThirdParty][makeself] found patched source in ${MAKESELF_PATH}, skip extract and patch")	21	message(STATUS "[ThirdParty][makeself] found patched source in ${MAKESELF_PATH}, skip extract and patch")
22	# 2. 本地缓存：同时存在tar包和patch文件，走本地缓存逻辑	22	# 2. 本地缓存：同时存在tar包和patch文件，走本地缓存逻辑
23	-elseif (EXISTS "${MAKESELF_TAR_PATH}" AND EXISTS "${MAKESELF_PATCH_PATH}")	23	+elseif (EXISTS "${MAKESELF_TAR_PATH}" AND EXISTS "${MAKESELF_PATCH}")
24	message(STATUS "[ThirdParty][makeself] use local cache tar and patch")	24	message(STATUS "[ThirdParty][makeself] use local cache tar and patch")
25	set(MAKESELF_NEED_EXTRACT TRUE)	25	set(MAKESELF_NEED_EXTRACT TRUE)
26	# 3. 其余情况：下载tar包和patch包	26	# 3. 其余情况：下载tar包和patch包
27	else()	27	else()
28	message(STATUS "[ThirdParty][makeself] downloading tar and patch")	28	message(STATUS "[ThirdParty][makeself] downloading tar and patch")
29	- file(MAKE_DIRECTORY "${CANN_3RD_LIB_PATH}/pkg")	29	+ file(MAKE_DIRECTORY "${CANN_3RD_LIB_PATH}/patch")
30		30
31	if (NOT EXISTS "${MAKESELF_TAR_PATH}")	31	if (NOT EXISTS "${MAKESELF_TAR_PATH}")
32	message(STATUS "[ThirdParty][makeself] downloading tar from ${REQ_URL}")	32	message(STATUS "[ThirdParty][makeself] downloading tar from ${REQ_URL}")
	@@ -41,11 +41,11 @@ else()
41	endif()	41	endif()
42	endif()	42	endif()
43		43
44	- if (NOT EXISTS "${MAKESELF_PATCH_PATH}")	44	+ if (NOT EXISTS "${MAKESELF_PATCH}")
45	message(STATUS "[ThirdParty][makeself] downloading patch from ${PATCH_REQ_URL}")	45	message(STATUS "[ThirdParty][makeself] downloading patch from ${PATCH_REQ_URL}")
46	- file(DOWNLOAD "${PATCH_REQ_URL}" "${MAKESELF_PATCH_PATH}"	46	+ file(DOWNLOAD "${PATCH_REQ_URL}" "${MAKESELF_PATCH}"
47	TIMEOUT 300	47	TIMEOUT 300
48	- EXPECTED_HASH SHA256=abb9efe26f95db61ce927a7d046ea2c73ec908cec984ea6316892b4c8b11d784	48	+ EXPECTED_HASH SHA256=0ecac3fe200221353322626900d5257a59d98347f83653b98456e08475994486
49	STATUS PATCH_DOWNLOAD_STATUS	49	STATUS PATCH_DOWNLOAD_STATUS
50	)	50	)
51	list(GET PATCH_DOWNLOAD_STATUS 0 PATCH_DOWNLOAD_CODE)	51	list(GET PATCH_DOWNLOAD_STATUS 0 PATCH_DOWNLOAD_CODE)
	@@ -74,7 +74,7 @@ if(MAKESELF_NEED_EXTRACT)
74	execute_process(	74	execute_process(
75	COMMAND patch -N --batch --quiet -r - -p1	75	COMMAND patch -N --batch --quiet -r - -p1
76	WORKING_DIRECTORY "${MAKESELF_PATH}"	76	WORKING_DIRECTORY "${MAKESELF_PATH}"
77	- INPUT_FILE "${MAKESELF_PATCH_PATH}"	77	+ INPUT_FILE "${MAKESELF_PATCH}"
78	RESULT_VARIABLE PATCH_RESULT	78	RESULT_VARIABLE PATCH_RESULT
79	ERROR_VARIABLE PATCH_ERROR	79	ERROR_VARIABLE PATCH_ERROR
80	)	80	)

Mthird_party/mockcpp.cmake+5-6

	@@ -22,7 +22,7 @@ set(mockcpp_CXXFLAGS "${mockcpp_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=${CANN_CXX11_
22	#依赖蓝区二进制仓mockcpp	22	#依赖蓝区二进制仓mockcpp
23	set(FILE_NAME mockcpp-2.7.tar.gz)	23	set(FILE_NAME mockcpp-2.7.tar.gz)
24	set(BOOST_INCLUDE_DIR ${CANN_3RD_LIB_PATH}/boost)	24	set(BOOST_INCLUDE_DIR ${CANN_3RD_LIB_PATH}/boost)
25	-set(MOCKCPP_DOWNLOAD_PATH ${CANN_3RD_LIB_PATH}/pkg)	25	+set(MOCKCPP_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch)
26	set(MOCKCPP_SOURCE_PATH ${CANN_3RD_LIB_PATH}/mockcpp)	26	set(MOCKCPP_SOURCE_PATH ${CANN_3RD_LIB_PATH}/mockcpp)
27	set(MOCK_INSTALL_PATH ${CANN_3RD_LIB_PATH}/lib_cache/mockcpp)	27	set(MOCK_INSTALL_PATH ${CANN_3RD_LIB_PATH}/lib_cache/mockcpp)
28		28
	@@ -31,15 +31,15 @@ include(ExternalProject)
31	if(EXISTS ${CANN_3RD_LIB_PATH}/mockcpp-2.7-h5.patch)	31	if(EXISTS ${CANN_3RD_LIB_PATH}/mockcpp-2.7-h5.patch)
32	set(PATCH_FILE "${CANN_3RD_LIB_PATH}/mockcpp-2.7-h5.patch")	32	set(PATCH_FILE "${CANN_3RD_LIB_PATH}/mockcpp-2.7-h5.patch")
33	add_custom_target(mockcpp_patch)	33	add_custom_target(mockcpp_patch)
34	-elseif(EXISTS ${MOCKCPP_DOWNLOAD_PATH}/mockcpp-2.7-h5.patch)	34	+elseif(EXISTS ${MOCKCPP_PATCH_PATH}/mockcpp-2.7-h5.patch)
35	- set(PATCH_FILE ${MOCKCPP_DOWNLOAD_PATH}/mockcpp-2.7-h5.patch)	35	+ set(PATCH_FILE ${MOCKCPP_PATCH_PATH}/mockcpp-2.7-h5.patch)
36	add_custom_target(mockcpp_patch)	36	add_custom_target(mockcpp_patch)
37	else()	37	else()
38	- set(PATCH_FILE ${MOCKCPP_DOWNLOAD_PATH}/mockcpp-2.7-h5.patch)	38	+ set(PATCH_FILE ${MOCKCPP_PATCH_PATH}/mockcpp-2.7-h5.patch)
39	ExternalProject_Add(mockcpp_patch	39	ExternalProject_Add(mockcpp_patch
40	URL "https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch"	40	URL "https://gitcode.com/cann-src-third-party/mockcpp/releases/download/v2.7-h5/mockcpp-2.7-h5.patch"
41	URL_HASH SHA256=65a2aac5e8ffe1a0eb983e4455972ef70b9850d4283ea7d4cc83e3cb97e98c5e	41	URL_HASH SHA256=65a2aac5e8ffe1a0eb983e4455972ef70b9850d4283ea7d4cc83e3cb97e98c5e
42	- DOWNLOAD_DIR ${MOCKCPP_DOWNLOAD_PATH}	42	+ DOWNLOAD_DIR ${MOCKCPP_PATCH_PATH}
43	DOWNLOAD_NO_EXTRACT TRUE	43	DOWNLOAD_NO_EXTRACT TRUE
44	DOWNLOAD_NO_PROGRESS TRUE	44	DOWNLOAD_NO_PROGRESS TRUE
45	TIMEOUT 60	45	TIMEOUT 60
	@@ -71,7 +71,6 @@ ExternalProject_Add(mockcpp_static_build
71	URL_HASH SHA256=73ab0a8b6d1052361c2cebd85e022c0396f928d2e077bf132790ae3be766f603	71	URL_HASH SHA256=73ab0a8b6d1052361c2cebd85e022c0396f928d2e077bf132790ae3be766f603
72	TIMEOUT 300	72	TIMEOUT 300
73	DEPENDS third_party_boost mockcpp_patch	73	DEPENDS third_party_boost mockcpp_patch
74	- DOWNLOAD_DIR ${MOCKCPP_DOWNLOAD_PATH}
75	SOURCE_DIR ${MOCKCPP_SOURCE_PATH}	74	SOURCE_DIR ${MOCKCPP_SOURCE_PATH}
76	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 < ${PATCH_FILE}	75	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 < ${PATCH_FILE}
77	CONFIGURE_COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}	76	CONFIGURE_COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}

Mthird_party/rdma-core.cmake+14-15

	@@ -16,11 +16,11 @@ unset(RDMA_CORE_INCLUDE CACHE)
16	if(PRODUCT_SIDE STREQUAL "device")	16	if(PRODUCT_SIDE STREQUAL "device")
17	set(RDMA_CORE_SRC_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/rdma_core_src)	17	set(RDMA_CORE_SRC_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/rdma_core_src)
18	set(RDMA_CORE_BUILD_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/rdma_core_build)	18	set(RDMA_CORE_BUILD_DIR ${CANN_3RD_LIB_PATH}/lib_cache/device/rdma_core_build)
19	- set(RDMA_CORE_PKG_DIR ${CANN_3RD_LIB_PATH}/pkg/device)	19	+ set(RDMA_CORE_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch/device)
20	else()	20	else()
21	set(RDMA_CORE_SRC_DIR ${CANN_3RD_LIB_PATH}/lib_cache/rdma_core_src)	21	set(RDMA_CORE_SRC_DIR ${CANN_3RD_LIB_PATH}/lib_cache/rdma_core_src)
22	set(RDMA_CORE_BUILD_DIR ${CANN_3RD_LIB_PATH}/lib_cache/rdma_core_build)	22	set(RDMA_CORE_BUILD_DIR ${CANN_3RD_LIB_PATH}/lib_cache/rdma_core_build)
23	- set(RDMA_CORE_PKG_DIR ${CANN_3RD_LIB_PATH}/pkg)	23	+ set(RDMA_CORE_PATCH_PATH ${CANN_3RD_LIB_PATH}/patch)
24	endif()	24	endif()
25		25
26		26
	@@ -51,8 +51,8 @@ if(rdma_core_FOUND AND NOT FORCE_REBUILD_CANN_3RD)
51	set(RDMA_CORE_INCLUDE_DIR "${RDMA_CORE_INCLUDE}")	51	set(RDMA_CORE_INCLUDE_DIR "${RDMA_CORE_INCLUDE}")
52	message(STATUS "[ThirdParty][rdma-core] rdma-core found in ${RDMA_CORE_BUILD_DIR}, and not force rebuild cann third_party")	52	message(STATUS "[ThirdParty][rdma-core] rdma-core found in ${RDMA_CORE_BUILD_DIR}, and not force rebuild cann third_party")
53	else()	53	else()
54	- if(EXISTS "${RDMA_CORE_PKG_DIR}/${RDMA_CORE_PATCH_FILE}")	54	+ if(EXISTS "${RDMA_CORE_PATCH_PATH}/${RDMA_CORE_PATCH_FILE}")
55	- set(RDMA_CORE_PATCH "${RDMA_CORE_PKG_DIR}/${RDMA_CORE_PATCH_FILE}")	55	+ set(RDMA_CORE_PATCH "${RDMA_CORE_PATCH_PATH}/${RDMA_CORE_PATCH_FILE}")
56	elseif(EXISTS "${CANN_3RD_LIB_PATH}/${RDMA_CORE_PATCH_FILE}")	56	elseif(EXISTS "${CANN_3RD_LIB_PATH}/${RDMA_CORE_PATCH_FILE}")
57	set(RDMA_CORE_PATCH "${CANN_3RD_LIB_PATH}/${RDMA_CORE_PATCH_FILE}")	57	set(RDMA_CORE_PATCH "${CANN_3RD_LIB_PATH}/${RDMA_CORE_PATCH_FILE}")
58	elseif(EXISTS "${CANN_3RD_LIB_PATH}/rdma-core/${RDMA_CORE_PATCH_FILE}")	58	elseif(EXISTS "${CANN_3RD_LIB_PATH}/rdma-core/${RDMA_CORE_PATCH_FILE}")
	@@ -62,20 +62,20 @@ else()
62	endif()	62	endif()
63		63
64	if(RDMA_CORE_PATCH_PROJECT_URL)	64	if(RDMA_CORE_PATCH_PROJECT_URL)
65	- ExternalProject_Add(rdma_core_patch	65	+ ExternalProject_Add(rdma_core_patch
66	URL ${RDMA_CORE_PATCH_PROJECT_URL}	66	URL ${RDMA_CORE_PATCH_PROJECT_URL}
67	- URL_HASH SHA256=54ca56b3b68bc465a78dd5839cd7110610745c7152a1dc3a72b265deeebb905f	67	+ URL_HASH SHA256=54ca56b3b68bc465a78dd5839cd7110610745c7152a1dc3a72b265deeebb905f
68	- TIMEOUT 60	68	+ TIMEOUT 60
69	- DOWNLOAD_DIR ${RDMA_CORE_PKG_DIR}	69	+ DOWNLOAD_DIR ${RDMA_CORE_PATCH_PATH}
70	- UPDATE_COMMAND ""	70	+ UPDATE_COMMAND ""
71	- CONFIGURE_COMMAND ""	71	+ CONFIGURE_COMMAND ""
72	- BUILD_COMMAND ""	72	+ BUILD_COMMAND ""
73	- INSTALL_COMMAND ""	73	+ INSTALL_COMMAND ""
74	DOWNLOAD_NO_EXTRACT TRUE	74	DOWNLOAD_NO_EXTRACT TRUE
75	DOWNLOAD_NO_PROGRESS TRUE	75	DOWNLOAD_NO_PROGRESS TRUE
76	- EXCLUDE_FROM_ALL TRUE	76	+ EXCLUDE_FROM_ALL TRUE
77	)	77	)
78	- set(RDMA_CORE_PATCH "${RDMA_CORE_PKG_DIR}/${RDMA_CORE_PATCH_FILE}")	78	+ set(RDMA_CORE_PATCH "${RDMA_CORE_PATCH_PATH}/${RDMA_CORE_PATCH_FILE}")
79	else()	79	else()
80	add_custom_target(rdma_core_patch)	80	add_custom_target(rdma_core_patch)
81	endif()	81	endif()
	@@ -100,7 +100,6 @@ else()
100	URL_HASH SHA256=aa935de1fcd07c42f7237b0284b5697b1ace2a64f2bcfca3893185bc91b8c74d	100	URL_HASH SHA256=aa935de1fcd07c42f7237b0284b5697b1ace2a64f2bcfca3893185bc91b8c74d
101	TIMEOUT 300	101	TIMEOUT 300
102	SOURCE_DIR ${RDMA_CORE_SRC_DIR}	102	SOURCE_DIR ${RDMA_CORE_SRC_DIR}
103	- DOWNLOAD_DIR ${RDMA_CORE_PKG_DIR}
104	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 -i "${RDMA_CORE_PATCH}"	103	PATCH_COMMAND patch --forward --batch --quiet -r - -p1 -i "${RDMA_CORE_PATCH}"
105	CONFIGURE_COMMAND ""	104	CONFIGURE_COMMAND ""
106	BUILD_COMMAND ""	105	BUILD_COMMAND ""