adapt new opbase open path of external include files-ops-nn-AtomGit

已合并

adapt new opbase open path of external include files #4875

yang-di52创建于 5月15日从yang-di52/ops-nn： bugfix1 合入到 cann/ops-nn： master

adapt new opbase open path of external include files #4875

已合并

yang-di52创建于 5月15日

从yang-di52/ops-nn bugfix1合入到cann/ops-nn master

共 3 个文件变更+17-6

Mcmake/gen_ops_info.cmake+2-2

	@@ -55,14 +55,14 @@ function(kernel_src_copy)
55	COMMAND	55	COMMAND
56	bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss ${KNCPY_DST_DIR}/common"	56	bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss ${KNCPY_DST_DIR}/common"
57	COMMAND	57	COMMAND
58	- bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel ${KNCPY_DST_DIR}/common"	58	+ bash -c "cp -r ${OPBASE_SOURCE_PATH}/include/op_common/op_kernel ${KNCPY_DST_DIR}/common"
59	VERBATIM	59	VERBATIM
60	)	60	)
61	add_dependencies(${KNCPY_TARGET} atvoss_src_copy)	61	add_dependencies(${KNCPY_TARGET} atvoss_src_copy)
62	endif()	62	endif()
63	if(ENABLE_PACKAGE)	63	if(ENABLE_PACKAGE)
64	install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss DESTINATION ${IMPL_INSTALL_DIR}/common)	64	install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss DESTINATION ${IMPL_INSTALL_DIR}/common)
65	- install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel DESTINATION ${IMPL_INSTALL_DIR}/common)	65	+ install(DIRECTORY ${OPBASE_SOURCE_PATH}/include/op_common/op_kernel DESTINATION ${IMPL_INSTALL_DIR}/common)
66	endif()	66	endif()
67	endfunction()	67	endfunction()
68		68

Mcmake/modules/FindOPBASE.cmake+5-0

	@@ -16,7 +16,9 @@ endif()
16	include(FindPackageHandleStandardArgs)	16	include(FindPackageHandleStandardArgs)
17		17
18	set(OPBASE_HEAD_SEARCH_PATHS	18	set(OPBASE_HEAD_SEARCH_PATHS
		19	+ ${OPBASE_SOURCE_PATH}/include
19	${OPBASE_SOURCE_PATH}/pkg_inc	20	${OPBASE_SOURCE_PATH}/pkg_inc
		21	+ ${TOP_DIR}/ops-base/include
20	${TOP_DIR}/ops-base/pkg_inc # compile with ci	22	${TOP_DIR}/ops-base/pkg_inc # compile with ci
21	)	23	)
22		24
	@@ -41,5 +43,8 @@ if(OPBASE_FOUND)
41	${OPBASE_INC_DIR}	43	${OPBASE_INC_DIR}
42	${OPBASE_INC_DIR}/op_common	44	${OPBASE_INC_DIR}/op_common
43	${OPBASE_INC_DIR}/op_common/op_host	45	${OPBASE_INC_DIR}/op_common/op_host
		46	+ ${OPBASE_INC_DIR}/../pkg_inc
		47	+ ${OPBASE_INC_DIR}/../pkg_inc/op_common
		48	+ ${OPBASE_INC_DIR}/../pkg_inc/op_common/op_host
44	)	49	)
45	endif()	50	endif()

Mcmake/third_party/opbase.cmake+10-4

	@@ -7,7 +7,7 @@
7	# INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.	7	# INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
8	# See LICENSE in the root of the software repository for the full text of the License.	8	# See LICENSE in the root of the software repository for the full text of the License.
9	# ----------------------------------------------------------------------------	9	# ----------------------------------------------------------------------------
10	-set(OPBASE_TAG_ID 4eef729541e1b7c12584ca1f5eeec81a0468f844)	10	+set(OPBASE_TAG_ID 6604d3c3aab00e34221fb2690db0a5d5c8771599)
11		11
12	if(EXISTS "${PROJECT_SOURCE_DIR}/../../ops-base")	12	if(EXISTS "${PROJECT_SOURCE_DIR}/../../ops-base")
13	get_filename_component(OPBASE_SOURCE_PATH	13	get_filename_component(OPBASE_SOURCE_PATH
	@@ -44,10 +44,16 @@ else()
44		44
45	set(OPBASE_SOURCE_PATH ${CANN_3RD_LIB_PATH}/opbase)	45	set(OPBASE_SOURCE_PATH ${CANN_3RD_LIB_PATH}/opbase)
46		46
47	- if(EXISTS ${OPBASE_SOURCE_PATH}/include)
48	- file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/include)
49	- endif()
50	if(EXISTS ${OPBASE_SOURCE_PATH}/aicpu_common)	47	if(EXISTS ${OPBASE_SOURCE_PATH}/aicpu_common)
51	file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/aicpu_common)	48	file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/aicpu_common)
52	endif()	49	endif()
		50	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/log)
		51	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/log)
		52	+ endif()
		53	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_host)
		54	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_host)
		55	+ endif()
		56	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel)
		57	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel)
		58	+ endif()
53	endif()	59	endif()