diff --git a/CMakeLists.txt b/CMakeLists.txt index 021e7798..3a8b9dc7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,7 @@ elseif (ENABLE_D OR ENABLE_ACL) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(slog libslog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(slog libalog.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) @@ -177,7 +177,7 @@ elseif(ENABLE_MS_TESTCASES) include(cmake/intf_pub_linux.cmake) # common libraries - find_module(slog libslog.so ${ASCEND_MS_DRIVER_PATH}) + find_module(slog libalog.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(error_manager liberror_manager.so ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) find_module(static_mmpa libmmpa.a ${ASCEND_MS_RUNTIME_PATH} ${ATLAS_MS_RUNTIME_PATH}) diff --git a/ge/common/CMakeLists.txt b/ge/common/CMakeLists.txt index ac230f6d..45db5228 100755 --- a/ge/common/CMakeLists.txt +++ b/ge/common/CMakeLists.txt @@ -179,6 +179,7 @@ target_compile_definitions(ge_common PRIVATE FMK_SUPPORT_DUMP OS_CENTOS google=ascend_private + LOG_CPP ) target_compile_options(ge_common PRIVATE diff --git a/ge/ge_runtime/CMakeLists.txt b/ge/ge_runtime/CMakeLists.txt index ce1b89ea..ded8fd39 100644 --- a/ge/ge_runtime/CMakeLists.txt +++ b/ge/ge_runtime/CMakeLists.txt @@ -27,6 +27,7 @@ target_compile_options(ge_runtime PRIVATE target_compile_definitions(ge_runtime PRIVATE PROTOBUF_INLINE_NOT_IN_HEADERS=0 + LOG_CPP ) target_include_directories(ge_runtime PRIVATE diff --git a/metadef/graph/CMakeLists.txt b/metadef/graph/CMakeLists.txt index a56becc6..05ec1d36 100644 --- a/metadef/graph/CMakeLists.txt +++ b/metadef/graph/CMakeLists.txt @@ -366,8 +366,10 @@ target_compile_definitions(graph PRIVATE $<$:FMK_SUPPORT_DUMP> $<$:ONLY_COMPILE_OPEN_SRC> google=ascend_private + LOG_CPP ) + target_include_directories(graph PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_BINARY_DIR} diff --git a/third_party/prebuild/aarch64/libalog.so b/third_party/prebuild/aarch64/libalog.so new file mode 100755 index 00000000..e041ad7e Binary files /dev/null and b/third_party/prebuild/aarch64/libalog.so differ diff --git a/third_party/prebuild/x86_64/libalog.so b/third_party/prebuild/x86_64/libalog.so new file mode 100755 index 00000000..051f85d9 Binary files /dev/null and b/third_party/prebuild/x86_64/libalog.so differ