取消编译过程对ASCEND_CANN_PACKAGE_PATH的引用-asc-devkit-AtomGit

MCMakeLists.txt+1-5

	@@ -34,15 +34,11 @@ if(BUILD_OPEN_PROJECT)
34	include(cmake/config.cmake)	34	include(cmake/config.cmake)
35	include(cmake/func.cmake)	35	include(cmake/func.cmake)
36	set(INSTALL_LIBRARY_DIR ${CMAKE_SYSTEM_PROCESSOR}-linux)	36	set(INSTALL_LIBRARY_DIR ${CMAKE_SYSTEM_PROCESSOR}-linux)
37	-endif()
38	-
39	-add_subdirectory(impl)
40	-
41	-if(BUILD_OPEN_PROJECT)
42	include(cmake/intf_pub_linux.cmake)	37	include(cmake/intf_pub_linux.cmake)
43	include(cmake/dependencies.cmake)	38	include(cmake/dependencies.cmake)
44	endif()	39	endif()
45		40
		41	+add_subdirectory(impl)
46	add_subdirectory(tools)	42	add_subdirectory(tools)
47	add_subdirectory(cmake)	43	add_subdirectory(cmake)
48		44

Mcmake/dependencies.cmake+2-0

	@@ -21,6 +21,8 @@ find_cann_package(mmpa REQUIRED)
21	find_cann_package(metadef REQUIRED)	21	find_cann_package(metadef REQUIRED)
22	find_cann_package(platform REQUIRED)	22	find_cann_package(platform REQUIRED)
23	find_cann_package(error_manager REQUIRED)	23	find_cann_package(error_manager REQUIRED)
		24	+find_cann_package(acl_rt REQUIRED)
		25	+find_cann_package(runtime REQUIRED)
24		26
25	if(ENABLE_TEST)	27	if(ENABLE_TEST)
26	find_cann_package(graph REQUIRED)	28	find_cann_package(graph REQUIRED)

Mcmake/device/CMakeLists.txt+2-0

	@@ -23,6 +23,8 @@ get_filename_component(ASC_DEVKIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../.." ABSOLU
23		23
24	find_cann_package(aicpu_sharder REQUIRED)	24	find_cann_package(aicpu_sharder REQUIRED)
25	find_cann_package(tilingdata_base REQUIRED OBJECTS)	25	find_cann_package(tilingdata_base REQUIRED OBJECTS)
		26	+find_cann_package(metadef REQUIRED)
		27	+find_cann_package(unified_dlog REQUIRED)
26		28
27	include(${ASCENDC_DIR}/impl/adv_api/gen_kernel_tiling.cmake)	29	include(${ASCENDC_DIR}/impl/adv_api/gen_kernel_tiling.cmake)
28		30

Mcmake/fetch_cann_cmake.cmake+2-2

	@@ -14,12 +14,12 @@ if(NOT PROJECT_SOURCE_DIR)
14	else()	14	else()
15	include(FetchContent)	15	include(FetchContent)
16		16
17	- set(CANN_CMAKE_TAG "master-013")	17	+ set(CANN_CMAKE_TAG "master-015")
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
21	URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz"	21	URL "${CANN_3RD_LIB_PATH}/cmake-${CANN_CMAKE_TAG}.tar.gz"
22	- URL_HASH SHA256=b968975e34df6296a7d72a4c47a9a2091433c6f6d45a5ea8c36fb307352c40ef	22	+ URL_HASH SHA256=b8827cb7d30cbf1a6e40d79bca1910dc911dc05058563984b5f1ee104a1933e3
23	)	23	)
24	else()	24	else()
25	FetchContent_Declare(	25	FetchContent_Declare(

Mimpl/adv_api/tiling/CMakeLists.txt+4-6

	@@ -18,11 +18,6 @@ target_include_directories(
18	$<BUILD_INTERFACE:${ASCENDC_DIR}>	18	$<BUILD_INTERFACE:${ASCENDC_DIR}>
19	$<BUILD_INTERFACE:${ASCENDC_DIR}/include>	19	$<BUILD_INTERFACE:${ASCENDC_DIR}/include>
20	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/include/adv_api>>	20	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/include/adv_api>>
21	- $<$<BOOL:${BUILD_OPEN_PROJECT}>:$<BUILD_INTERFACE:${ASCEND_CANN_PACKAGE_PATH}>>
22	- $<$<BOOL:${BUILD_OPEN_PROJECT}>:$<BUILD_INTERFACE:${ASCEND_CANN_PACKAGE_PATH}/include>>
23	- $<$<BOOL:${BUILD_OPEN_PROJECT}>:$<BUILD_INTERFACE:${ASCEND_CANN_PACKAGE_PATH}/include/base>>
24	- $<$<BOOL:${BUILD_OPEN_PROJECT}>:$<BUILD_INTERFACE:${ASCEND_CANN_PACKAGE_PATH}/pkg_inc>>
25	- $<$<BOOL:${BUILD_OPEN_PROJECT}>:$<BUILD_INTERFACE:${ASCEND_CANN_PACKAGE_PATH}/pkg_inc/base>>
26	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/include/basic_api>>	21	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/include/basic_api>>
27	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/../../asc/asc-devkit>>	22	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/../../asc/asc-devkit>>
28	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/../../asc/asc-devkit/include>>	23	$<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:${ASCENDC_DIR}/../../asc/asc-devkit/include>>
	@@ -35,7 +30,10 @@ target_include_directories(
35	$<INSTALL_INTERFACE:include/ascendc/include/highlevel_api/tiling>)	30	$<INSTALL_INTERFACE:include/ascendc/include/highlevel_api/tiling>)
36		31
37	target_link_libraries(tiling_api_headers	32	target_link_libraries(tiling_api_headers
38	- INTERFACE $<BUILD_INTERFACE:tikcfw_headers>)	33	+ INTERFACE
		34	+ $<BUILD_INTERFACE:metadef_headers>
		35	+ $<BUILD_INTERFACE:unified_dlog>
		36	+ $<BUILD_INTERFACE:tikcfw_headers>)
39		37
40	add_library(	38	add_library(
41	tiling_api STATIC	39	tiling_api STATIC

Mimpl/aicpu_api/CMakeLists.txt+3-1

	@@ -28,9 +28,11 @@ target_compile_options(aicpu_api PRIVATE
28		28
29	if(BUILD_OPEN_PROJECT)	29	if(BUILD_OPEN_PROJECT)
30	target_include_directories(aicpu_api PRIVATE	30	target_include_directories(aicpu_api PRIVATE
31	- ${ASCEND_CANN_PACKAGE_PATH}/include
32	${CMAKE_CURRENT_SOURCE_DIR}/../../include	31	${CMAKE_CURRENT_SOURCE_DIR}/../../include
33	)	32	)
		33	+ target_link_libraries(aicpu_api PRIVATE
		34	+ c_sec
		35	+ )
34	else()	36	else()
35	target_include_directories(aicpu_api PRIVATE	37	target_include_directories(aicpu_api PRIVATE
36	${TOP_DIR}/abl/libc_sec/include	38	${TOP_DIR}/abl/libc_sec/include

Mtools/aclrtc/CMakeLists.txt+3-3

	@@ -16,11 +16,11 @@ add_library(acl_rtc SHARED
16	if(BUILD_OPEN_PROJECT)	16	if(BUILD_OPEN_PROJECT)
17	target_include_directories(acl_rtc PRIVATE	17	target_include_directories(acl_rtc PRIVATE
18	${CMAKE_CURRENT_SOURCE_DIR}/include	18	${CMAKE_CURRENT_SOURCE_DIR}/include
19	- ${ASCEND_CANN_PACKAGE_PATH}/include
20	- ${ASCEND_CANN_PACKAGE_PATH}/include/acl
21	- ${ASCEND_CANN_PACKAGE_PATH}/include/pkg_inc/base/
22	${CCEC_PATH}/../include	19	${CCEC_PATH}/../include
23	)	20	)
		21	+ target_link_libraries(acl_rtc PRIVATE
		22	+ acl_rt
		23	+ )
24	else()	24	else()
25	target_include_directories(acl_rtc PRIVATE	25	target_include_directories(acl_rtc PRIVATE
26	${CMAKE_CURRENT_SOURCE_DIR}/include	26	${CMAKE_CURRENT_SOURCE_DIR}/include

Mtools/build/asc_op_compile_base/CMakeLists.txt+0-2

	@@ -22,8 +22,6 @@ if(BUILD_OPEN_PROJECT)
22	target_include_directories(asc_platform PRIVATE	22	target_include_directories(asc_platform PRIVATE
23	${CMAKE_CURRENT_SOURCE_DIR}/c_api	23	${CMAKE_CURRENT_SOURCE_DIR}/c_api
24	${CMAKE_CURRENT_SOURCE_DIR}/../common	24	${CMAKE_CURRENT_SOURCE_DIR}/../common
25	- ${ASCEND_CANN_PACKAGE_PATH}/include
26	- ${ASCEND_CANN_PACKAGE_PATH}/include/base
27	)	25	)
28	else()	26	else()
29	target_include_directories(asc_platform PRIVATE	27	target_include_directories(asc_platform PRIVATE

Mtools/build/asc_rt/CMakeLists.txt+3-5

	@@ -11,13 +11,11 @@ add_library(ascend_runtime_base OBJECT ascendc_runtime.cpp aicpu_rt.cpp)
11		11
12	if(BUILD_OPEN_PROJECT)	12	if(BUILD_OPEN_PROJECT)
13	target_include_directories(ascend_runtime_base PRIVATE	13	target_include_directories(ascend_runtime_base PRIVATE
14	- ${ASCEND_CANN_PACKAGE_PATH}/pkg_inc/runtime
15	- ${ASCEND_CANN_PACKAGE_PATH}/pkg_inc/profiling
16	- ${ASCEND_CANN_PACKAGE_PATH}/pkg_inc
17	- ${ASCEND_CANN_PACKAGE_PATH}/include/acl
18	- ${ASCEND_CANN_PACKAGE_PATH}/include
19	${CMAKE_CURRENT_SOURCE_DIR}/../common	14	${CMAKE_CURRENT_SOURCE_DIR}/../common
20	)	15	)
		16	+ target_link_libraries(ascend_runtime_base PRIVATE
		17	+ runtime_headers
		18	+ )
21	else()	19	else()
22	target_include_directories(ascend_runtime_base PRIVATE	20	target_include_directories(ascend_runtime_base PRIVATE
23	${TOP_DIR}/runtime/include/external	21	${TOP_DIR}/runtime/include/external

Mtools/build/opbuild/CMakeLists.txt+0-6

	@@ -21,12 +21,6 @@ target_compile_options(op_build PRIVATE -Wextra -Wfloat-equal -fno-common -fpie
21		21
22	if(BUILD_OPEN_PROJECT)	22	if(BUILD_OPEN_PROJECT)
23	target_include_directories(op_build PRIVATE	23	target_include_directories(op_build PRIVATE
24	- ${ASCEND_CANN_PACKAGE_PATH}/${CMAKE_SYSTEM_PROCESSOR}-linux/pkg_inc/base
C C chenyiyuan5月21日已过期这里依赖放哪了？都在metadef_header里么 yangbinhua 5月21日评论： 5月21日评论：
25	- ${ASCEND_CANN_PACKAGE_PATH}/${CMAKE_SYSTEM_PROCESSOR}-linux/include
26	- ${ASCEND_CANN_PACKAGE_PATH}/include
27	- ${ASCEND_CANN_PACKAGE_PATH}/include/base
28	- ${ASCEND_CANN_PACKAGE_PATH}/pkg_inc/base
29	- ${ASCEND_CANN_PACKAGE_PATH}/include/ge
30	${CMAKE_CURRENT_SOURCE_DIR}/common	24	${CMAKE_CURRENT_SOURCE_DIR}/common
31	)	25	)
32	else()	26	else()