diff --git a/CMakeLists.txt b/CMakeLists.txt index c866553fd6943536ec723db6ff910fef68f43e6a..9bc4ef4f6dbe967ba4dc100c51f736f62ba6c717 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,13 +123,13 @@ if (ENABLE_OPEN_SRC) find_package(msprof MODULE REQUIRED) find_package(SymEngine CONFIG REQUIRED) find_package(Boost CONFIG REQUIRED) + find_package(slog MODULE REQUIRED) else() include(cmake/third_party/json.cmake) endif() # 自研软件包 find_package(securec MODULE REQUIRED) - find_package(slog MODULE REQUIRED) find_package(unified_dlog MODULE REQUIRED) if (NOT (ENABLE_METADEF_UT OR ENABLE_METADEF_ST)) find_package(mmpa MODULE REQUIRED) diff --git a/cmake/package.cmake b/cmake/package.cmake index e6354cb326254337b9ac424d7d38a3a7b58c18bf..1691e08908284b932d8bd06da6db01148d73a50e 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -168,12 +168,8 @@ set(EXTERNAL_GRAPH_FILES ${CMAKE_SOURCE_DIR}/inc/external/graph/ge_error_codes.h ${CMAKE_SOURCE_DIR}/inc/external/graph/infer_format_context.h ${CMAKE_SOURCE_DIR}/inc/external/graph/compiler_def.h - ${CMAKE_SOURCE_DIR}/inc/graph/op_desc.h ${CMAKE_SOURCE_DIR}/inc/external/graph/ascend_string.h ${CMAKE_SOURCE_DIR}/inc/external/graph/attr_value.h - ${CMAKE_SOURCE_DIR}/inc/external/graph/operator.h - ${CMAKE_SOURCE_DIR}/inc/external/graph/operator_factory.h - ${CMAKE_SOURCE_DIR}/inc/external/graph/resource_context.h ${CMAKE_SOURCE_DIR}/inc/external/graph/inference_context.h ${CMAKE_SOURCE_DIR}/inc/external/graph/types.h ) @@ -187,7 +183,6 @@ install(FILES ${CMAKE_SOURCE_DIR}/inc/external/utils/extern_math_util.h DESTINATION metadef/include/utils ) install(FILES ${CMAKE_SOURCE_DIR}/inc/external/ge/ge_allocator.h - ${CMAKE_SOURCE_DIR}/inc/external/ge_common/ge_api_types.h DESTINATION metadef/include/ge ) install(FILES ${CMAKE_SOURCE_DIR}/inc/external/ge_common/ge_api_types.h diff --git a/scripts/package/metadef/metadef.xml b/scripts/package/metadef/metadef.xml index 079de8ba0a082ffe41eca6593fc93df8950a4db1..f8a538d172277c2e94880a672af54606c1df8745 100644 --- a/scripts/package/metadef/metadef.xml +++ b/scripts/package/metadef/metadef.xml @@ -47,9 +47,9 @@ + - @@ -59,7 +59,6 @@ - diff --git a/scripts/package/module/ascend/EngineeringCommon.xml b/scripts/package/module/ascend/EngineeringCommon.xml index 6f974ee2dee296055497064129b0f7ca3981cfbc..50dfb85834cf0d5bea94174c35279674eb6023c6 100644 --- a/scripts/package/module/ascend/EngineeringCommon.xml +++ b/scripts/package/module/ascend/EngineeringCommon.xml @@ -7,6 +7,7 @@ + diff --git a/scripts/package/module/ascend/MetadefInc.xml b/scripts/package/module/ascend/MetadefInc.xml index 6d2876668b0a21828dfa8124f8eda0d78fae0867..1cf464f9ae08cd201300b365b5958458ea8945e7 100644 --- a/scripts/package/module/ascend/MetadefInc.xml +++ b/scripts/package/module/ascend/MetadefInc.xml @@ -1,7 +1,7 @@ - + @@ -13,7 +13,6 @@ - @@ -50,12 +49,8 @@ - - - - @@ -67,7 +62,6 @@ -