Browse Source

!164 update c76 code

Merge pull request !164 from 王涛/r1.2.0
pull/164/MERGE
i-robot Gitee 4 years ago
parent
commit
0a8a3210e3
5 changed files with 6 additions and 6 deletions
  1. +2
    -2
      CMakeLists.txt
  2. +1
    -1
      metadef
  3. +1
    -1
      parser/CMakeLists.txt
  4. +1
    -1
      parser/common/CMakeLists.txt
  5. +1
    -1
      parser/onnx/CMakeLists.txt

+ 2
- 2
CMakeLists.txt View File

@@ -33,7 +33,7 @@ if (ENABLE_OPEN_SRC)
message(FATAL_ERROR "Running on a unsupported architecture: ${SYSTEM_TYPE}, build terminated") message(FATAL_ERROR "Running on a unsupported architecture: ${SYSTEM_TYPE}, build terminated")
endif() endif()
set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH}) set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH})
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(static_mmpa libmmpa.a ${GE_LIB_PATH})
find_module(error_manager liberror_manager.so ${GE_LIB_PATH}) find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
else() else()
@@ -45,7 +45,7 @@ if (ENABLE_OPEN_SRC)


set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64) set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64)


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(static_mmpa libmmpa.a ${ASCEND_ATC_DIR})
find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR})
endif() endif()


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit a71110f5e42dc768ddbbd51289eb467518dedf9b
Subproject commit c3269edc0ec089dce4ae2e80f41fea42a57e7b6f

+ 1
- 1
parser/CMakeLists.txt View File

@@ -102,7 +102,7 @@ target_link_libraries(fmk_parser
register register
_caffe_parser _caffe_parser
c_sec c_sec
slog
alog
-Wl,--as-needed -Wl,--as-needed
json json
-lrt -lrt


+ 1
- 1
parser/common/CMakeLists.txt View File

@@ -81,7 +81,7 @@ target_link_libraries(parser_common PRIVATE
ascend_protobuf ascend_protobuf
register register
c_sec c_sec
slog
alog
error_manager error_manager
-Wl,--as-needed -Wl,--as-needed
json json


+ 1
- 1
parser/onnx/CMakeLists.txt View File

@@ -70,7 +70,7 @@ target_link_libraries(fmk_onnx_parser PRIVATE
c_sec c_sec
parser_common parser_common
graph graph
slog
alog
-Wl,--as-needed -Wl,--as-needed
json json
-lrt -lrt


Loading…
Cancel
Save