diff --git a/CMakeLists.txt b/CMakeLists.txt index fdc857bd..1288ea2c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,8 +82,8 @@ else() else() set(ASCEND_DIR /usr/local/Ascend) endif() - set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64/common) - set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64) + set(ASCEND_DRIVER_DIR ${ASCEND_DIR}/driver/lib64/common ${ASCEND_DIR}/driver/lib64) + set(ASCEND_RUNTIME_DIR ${ASCEND_DIR}/fwkacllib/lib64 ${ASCEND_DIR}/acllib/lib64 ${ASCEND_DIR}/atc/lib64) find_library(slog libslog.so ${ASCEND_DRIVER_DIR}) find_library(mmpa libmmpa.so ${ASCEND_DRIVER_DIR}) find_library(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) diff --git a/src/ge/CMakeLists.txt b/src/ge/CMakeLists.txt index 3f4f1a8b..77d15449 100755 --- a/src/ge/CMakeLists.txt +++ b/src/ge/CMakeLists.txt @@ -208,13 +208,14 @@ file(GLOB TRAIN_SRC_LIST RELATIVE ${CMAKE_CURRENT_LIST_DIR} ######### libge_runner.so ############# -add_library(ge_runner SHARED ${TRAIN_SRC_LIST} ${PROTO_SRCS} ${PROTO_CLIENT_SRCS} ${PROTO_HEADER_HDRS}) -target_compile_definitions(ge_runner PRIVATE +if (NOT ENABLE_ACL) + add_library(ge_runner SHARED ${TRAIN_SRC_LIST} ${PROTO_SRCS} ${PROTO_CLIENT_SRCS} ${PROTO_HEADER_HDRS}) + target_compile_definitions(ge_runner PRIVATE PROTOBUF_INLINE_NOT_IN_HEADERS=0 DAVINCI_SUPPORT_PROFILING REUSE_MEMORY=1 DAVINCI_CLOUD) -target_link_libraries(ge_runner + target_link_libraries(ge_runner graph ge_common ge_memory @@ -232,6 +233,7 @@ target_link_libraries(ge_runner ${msprofiler} rt dl) +endif () ######### libge_compiler.so ############# # need to remove dependencies on pb files later