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

已合并

adapt new opbase open path of external include files #2670

zl_hw创建于 5月11日从zl_hw/ops-math： master 合入到 cann/ops-math： master

adapt new opbase open path of external include files #2670

已合并

zl_hw创建于 5月11日

从zl_hw/ops-math master合入到cann/ops-math master

共 3 个文件变更+17-6

Mcmake/gen_ops_info.cmake+2-2

	@@ -46,13 +46,13 @@ function(kernel_src_copy)
46	COMMAND	46	COMMAND
47	bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss ${KNCPY_DST_DIR}/common"	47	bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss ${KNCPY_DST_DIR}/common"
48	COMMAND	48	COMMAND
49	- bash -c "cp -r ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel ${KNCPY_DST_DIR}/common"	49	+ bash -c "cp -r ${OPBASE_SOURCE_PATH}/include/op_common/op_kernel ${KNCPY_DST_DIR}/common"
50	VERBATIM	50	VERBATIM
51	)	51	)
52	add_dependencies(${KNCPY_TARGET} atvoss_src_copy)	52	add_dependencies(${KNCPY_TARGET} atvoss_src_copy)
53	if(ENABLE_PACKAGE)	53	if(ENABLE_PACKAGE)
54	install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss DESTINATION ${IMPL_INSTALL_DIR}/common)	54	install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/atvoss DESTINATION ${IMPL_INSTALL_DIR}/common)
55	- install(DIRECTORY ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel DESTINATION ${IMPL_INSTALL_DIR}/common)	55	+ install(DIRECTORY ${OPBASE_SOURCE_PATH}/include/op_common/op_kernel DESTINATION ${IMPL_INSTALL_DIR}/common)
56	endif()	56	endif()
57	endfunction()	57	endfunction()
58		58

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 # 本地下载的opbase	20	${OPBASE_SOURCE_PATH}/pkg_inc # 本地下载的opbase
		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
	@@ -40,5 +42,8 @@ if(OPBASE_FOUND)
40	${OPBASE_INC_DIR}	42	${OPBASE_INC_DIR}
41	${OPBASE_INC_DIR}/op_common	43	${OPBASE_INC_DIR}/op_common
42	${OPBASE_INC_DIR}/op_common/op_host	44	${OPBASE_INC_DIR}/op_common/op_host
		45	+ ${OPBASE_INC_DIR}/../pkg_inc
		46	+ ${OPBASE_INC_DIR}/../pkg_inc/op_common
		47	+ ${OPBASE_INC_DIR}/../pkg_inc/op_common/op_host
43	)	48	)
44	endif()	49	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 cc7abcd40480902c0d20204a1b6a3d98edaa9253)	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
	@@ -45,10 +45,16 @@ else()
45		45
46	set(OPBASE_SOURCE_PATH ${CANN_3RD_LIB_PATH}/opbase)	46	set(OPBASE_SOURCE_PATH ${CANN_3RD_LIB_PATH}/opbase)
47		47
48	- if(EXISTS ${OPBASE_SOURCE_PATH}/include)
49	- file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/include)
50	- endif()
51	if(EXISTS ${OPBASE_SOURCE_PATH}/aicpu_common)	48	if(EXISTS ${OPBASE_SOURCE_PATH}/aicpu_common)
52	file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/aicpu_common)	49	file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/aicpu_common)
53	endif()	50	endif()
		51	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/log)
		52	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/log)
		53	+ endif()
		54	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_host)
		55	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_host)
		56	+ endif()
		57	+ if(EXISTS ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel)
		58	+ file(REMOVE_RECURSE ${OPBASE_SOURCE_PATH}/pkg_inc/op_common/op_kernel)
		59	+ endif()
54	endif()	60	endif()