hummingbird
/
graphengine
Not watched
2
0
Fork 0
Code
Releases 13 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

update slog to alog

pull/716/head
wqtshg 4 years ago
parent
86bb779cee
commit
eaeaec68ff
9 changed files with 25 additions and 25 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -6
      CMakeLists.txt
  2. +3
    -3
      ge/CMakeLists.txt
  3. +2
    -2
      ge/common/CMakeLists.txt
  4. +1
    -1
      ge/executor/CMakeLists.txt
  5. +4
    -4
      ge/ge_local_engine/CMakeLists.txt
  6. +1
    -1
      ge/ge_runtime/CMakeLists.txt
  7. +4
    -4
      ge/host_cpu_engine/CMakeLists.txt
  8. +3
    -3
      ge/offline/CMakeLists.txt
  9. +1
    -1
      ge/plugin/engine/CMakeLists.txt

+ 6
- 6
CMakeLists.txt View File

@@ -52,10 +52,10 @@ if (ENABLE_OPEN_SRC)
include(cmake/FindModule.cmake)
include(cmake/intf_pub_linux.cmake)

# for CPU/GPU mode, find c_sec and slog from local prebuild
# for CPU/GPU mode, find c_sec and alog from local prebuild
#if(NOT ENABLE_D AND NOT GE_ONLY)
# set(GE_PREBUILD_PATH ${GE_CODE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
# find_module(slog libslog.so ${GE_PREBUILD_PATH})
# find_module(alog libalog.so ${GE_PREBUILD_PATH})
# if D_LINK_PATH is set in environment variables, search libraries in given path
if(DEFINED ENV{D_LINK_PATH})
# D_LINK_PATH is set
@@ -72,7 +72,7 @@ if (ENABLE_OPEN_SRC)
endif()
set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
set(STATIC_ACL_LIB ${GE_LIB_PATH})
find_module(slog libslog.so ${GE_LIB_PATH})
find_module(alog libalog.so ${GE_LIB_PATH})
find_module(static_mmpa libmmpa.a ${GE_LIB_PATH})
find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH})
find_module(hccl libhccl.so ${GE_LIB_PATH})
@@ -88,7 +88,7 @@ if (ENABLE_OPEN_SRC)
elseif(ENABLE_GE_COV OR ENABLE_GE_UT)
add_subdirectory(tests)
else()
find_module(slog libslog.so ${ASCEND_ATC_DIR})
find_module(alog libalog.so ${ASCEND_ATC_DIR})
find_module(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR})
if(PLATFORM STREQUAL "train")
@@ -154,7 +154,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(alog libalog.so ${ASCEND_MS_DRIVER_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})

@@ -174,7 +174,7 @@ elseif(ENABLE_MS_TESTCASES)
include(cmake/intf_pub_linux.cmake)

# common libraries
find_module(slog libslog.so ${ASCEND_MS_DRIVER_PATH})
find_module(alog libalog.so ${ASCEND_MS_DRIVER_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})



+ 3
- 3
ge/CMakeLists.txt View File

@@ -662,7 +662,7 @@ target_link_libraries(ge_runner PRIVATE
ascend_protobuf
register
c_sec
slog
alog
runtime
resource
error_manager
@@ -726,7 +726,7 @@ target_link_libraries(ge_compiler PRIVATE
register
c_sec
error_manager
slog
alog
runtime_compile
resource
-Wl,--as-needed
@@ -793,7 +793,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE
-Wl,--no-as-needed
c_sec
runtime
slog
alog
ascend_hal_stub
-Wl,--as-needed
-lrt


+ 2
- 2
ge/common/CMakeLists.txt View File

@@ -113,7 +113,7 @@ target_link_libraries(ge_common PRIVATE
register
c_sec
error_manager
slog
alog
-Wl,--as-needed
json
$<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt>
@@ -212,7 +212,7 @@ target_link_libraries(ge_common PRIVATE
register
c_sec
error_manager
slog
alog
static_mmpa
-Wl,--as-needed
json


+ 1
- 1
ge/executor/CMakeLists.txt View File

@@ -242,7 +242,7 @@ target_link_libraries(ge_executor_shared PRIVATE
-Wl,--no-as-needed
ge_common
runtime
slog
alog
mmpa
graph
register


+ 4
- 4
ge/ge_local_engine/CMakeLists.txt View File

@@ -57,7 +57,7 @@ target_link_libraries(ge_local_engine PRIVATE
ascend_protobuf
register
c_sec
slog
alog
runtime
-Wl,--as-needed
)
@@ -99,7 +99,7 @@ target_link_libraries(atc_ge_local_engine PRIVATE
ascend_protobuf
register
c_sec
slog
alog
runtime_compile
-Wl,--as-needed
)
@@ -143,7 +143,7 @@ target_link_libraries(ge_local_opskernel_builder PRIVATE
-Wl,--no-as-needed
ascend_protobuf
c_sec
slog
alog
register
graph
-Wl,--as-needed
@@ -183,7 +183,7 @@ target_link_libraries(atc_ge_local_opskernel_builder PRIVATE
-Wl,--no-as-needed
ascend_protobuf
c_sec
slog
alog
register
graph
-Wl,--as-needed


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

@@ -53,7 +53,7 @@ target_include_directories(ge_runtime PRIVATE
target_link_libraries(ge_runtime PRIVATE
$<BUILD_INTERFACE:intf_pub>
-Wl,--no-as-needed
slog
alog
runtime
c_sec
graph


+ 4
- 4
ge/host_cpu_engine/CMakeLists.txt View File

@@ -50,7 +50,7 @@ target_link_libraries(host_cpu_engine PRIVATE
c_sec
graph
register
slog
alog
runtime
-Wl,--as-needed
)
@@ -91,7 +91,7 @@ target_link_libraries(atc_host_cpu_engine PRIVATE
c_sec
graph
register
slog
alog
runtime_compile
-Wl,--as-needed
)
@@ -134,7 +134,7 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE
-Wl,--no-as-needed
ascend_protobuf
c_sec
slog
alog
graph
register
-Wl,--as-needed
@@ -173,7 +173,7 @@ target_link_libraries(atc_host_cpu_opskernel_builder PRIVATE
-Wl,--no-as-needed
ascend_protobuf
c_sec
slog
alog
graph
register
-Wl,--as-needed


+ 3
- 3
ge/offline/CMakeLists.txt View File

@@ -69,7 +69,7 @@ target_link_libraries(atc PRIVATE
gflags
json
runtime_compile
slog
alog
static_mmpa
-lrt
-ldl
@@ -130,7 +130,7 @@ target_link_libraries(atc_atc.bin PRIVATE
gflags
json
runtime_compile
slog
alog
static_mmpa
-lrt
-ldl
@@ -196,7 +196,7 @@ target_link_libraries(fwk_atc.bin PRIVATE
gflags
json
runtime
slog
alog
static_mmpa
-lrt
-ldl


+ 1
- 1
ge/plugin/engine/CMakeLists.txt View File

@@ -34,7 +34,7 @@ target_include_directories(engine PRIVATE
target_link_libraries(engine PRIVATE
$<BUILD_INTERFACE:intf_pub>
-Wl,--no-as-needed
slog
alog
-Wl,--as-needed
-lrt
-ldl


Write Preview
Loading…
Cancel
Save