Browse Source

adapt to change from slog to alog

tags/v1.1.0
yanghaoran 4 years ago
parent
commit
bc7c82e424
6 changed files with 6 additions and 2 deletions
  1. +2
    -2
      CMakeLists.txt
  2. +1
    -0
      ge/common/CMakeLists.txt
  3. +1
    -0
      ge/ge_runtime/CMakeLists.txt
  4. +2
    -0
      metadef/graph/CMakeLists.txt
  5. BIN
      third_party/prebuild/aarch64/libalog.so
  6. BIN
      third_party/prebuild/x86_64/libalog.so

+ 2
- 2
CMakeLists.txt View File

@@ -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})



+ 1
- 0
ge/common/CMakeLists.txt View File

@@ -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


+ 1
- 0
ge/ge_runtime/CMakeLists.txt View File

@@ -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


+ 2
- 0
metadef/graph/CMakeLists.txt View File

@@ -366,8 +366,10 @@ target_compile_definitions(graph PRIVATE
$<$<STREQUAL:${PRODUCT_SIDE},host>:FMK_SUPPORT_DUMP>
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
google=ascend_private
LOG_CPP
)


target_include_directories(graph PRIVATE
${CMAKE_CURRENT_LIST_DIR}
${CMAKE_BINARY_DIR}


BIN
third_party/prebuild/aarch64/libalog.so View File


BIN
third_party/prebuild/x86_64/libalog.so View File


Loading…
Cancel
Save