| @@ -56,7 +56,7 @@ if (ENABLE_OPEN_SRC) | |||||
| set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH}) | set(GE_LIB_PATH ${GE_LIB_PATH}/${GE_SYS_ARCH}) | ||||
| set(STATIC_ACL_LIB ${GE_LIB_PATH}) | set(STATIC_ACL_LIB ${GE_LIB_PATH}) | ||||
| find_module(slog libslog.so ${GE_LIB_PATH}) | find_module(slog libslog.so ${GE_LIB_PATH}) | ||||
| find_module(mmpa libmmpa.so ${GE_LIB_PATH}) | |||||
| find_module(mmpa libmmpa.a ${GE_LIB_PATH}) | |||||
| find_module(msprof libmsprof.so ${GE_LIB_PATH}) | find_module(msprof libmsprof.so ${GE_LIB_PATH}) | ||||
| find_module(hccl libhccl.so ${GE_LIB_PATH}) | find_module(hccl libhccl.so ${GE_LIB_PATH}) | ||||
| find_module(adump_server libadump_server.a ${GE_LIB_PATH}) | find_module(adump_server libadump_server.a ${GE_LIB_PATH}) | ||||
| @@ -67,10 +67,10 @@ if (ENABLE_OPEN_SRC) | |||||
| find_module(ascend_hal_stub libascend_hal.so ${GE_LIB_PATH}) | find_module(ascend_hal_stub libascend_hal.so ${GE_LIB_PATH}) | ||||
| find_module(error_manager_static liberror_manager.a ${GE_LIB_PATH}) | find_module(error_manager_static liberror_manager.a ${GE_LIB_PATH}) | ||||
| find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH}) | find_module(msprofiler libmsprofiler.a ${GE_LIB_PATH}) | ||||
| #find_module(ascendcl_static libascendcl.a ${GE_LIB_PATH}) | |||||
| #find_module(ascendcl_static libascendcl.a ${GE_LIB_PATH}) | |||||
| else() | else() | ||||
| find_module(slog libslog.so ${ASCEND_ATC_DIR}) | find_module(slog libslog.so ${ASCEND_ATC_DIR}) | ||||
| find_module(mmpa libmmpa.so ${ASCEND_ATC_DIR}) | |||||
| find_module(mmpa libmmpa.a ${ASCEND_ATC_DIR}) | |||||
| if(PLATFORM STREQUAL "train") | if(PLATFORM STREQUAL "train") | ||||
| find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR}) | find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR}) | ||||
| find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR}) | find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR}) | ||||
| @@ -114,7 +114,7 @@ if (ENABLE_OPEN_SRC) | |||||
| find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR}) | find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR}) | ||||
| find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR}) | find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR}) | ||||
| find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver) | find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver) | ||||
| #find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) | |||||
| #find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) | |||||
| else() | else() | ||||
| message(FATAL_ERROR "PLATFORM param is invalid, should be train or inference, build terminated") | message(FATAL_ERROR "PLATFORM param is invalid, should be train or inference, build terminated") | ||||
| endif() | endif() | ||||
| @@ -648,6 +648,7 @@ target_link_libraries(ge_runner | |||||
| ge_memory | ge_memory | ||||
| adump_server | adump_server | ||||
| msprofiler | msprofiler | ||||
| static_mmpa | |||||
| -Wl,--no-as-needed | -Wl,--no-as-needed | ||||
| graph | graph | ||||
| ge_common | ge_common | ||||
| @@ -655,7 +656,6 @@ target_link_libraries(ge_runner | |||||
| register | register | ||||
| c_sec | c_sec | ||||
| slog | slog | ||||
| mmpa | |||||
| msprof | msprof | ||||
| runtime | runtime | ||||
| resource | resource | ||||
| @@ -712,6 +712,7 @@ target_include_directories(ge_compiler PRIVATE | |||||
| target_link_libraries(ge_compiler | target_link_libraries(ge_compiler | ||||
| $<BUILD_INTERFACE:intf_pub> | $<BUILD_INTERFACE:intf_pub> | ||||
| ge_memory | ge_memory | ||||
| static_mmpa | |||||
| -Wl,--no-as-needed | -Wl,--no-as-needed | ||||
| graph | graph | ||||
| ge_common | ge_common | ||||
| @@ -720,7 +721,6 @@ target_link_libraries(ge_compiler | |||||
| c_sec | c_sec | ||||
| error_manager | error_manager | ||||
| slog | slog | ||||
| mmpa | |||||
| runtime_compile | runtime_compile | ||||
| resource | resource | ||||
| -Wl,--as-needed | -Wl,--as-needed | ||||
| @@ -770,6 +770,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE | |||||
| ge_executor | ge_executor | ||||
| ge_common_static | ge_common_static | ||||
| graph_static | graph_static | ||||
| static_mmpa | |||||
| ascend_protobuf_static | ascend_protobuf_static | ||||
| register_static | register_static | ||||
| error_manager_static | error_manager_static | ||||
| @@ -779,11 +780,11 @@ target_link_libraries(opensrc_ascendcl PRIVATE | |||||
| -Wl,--no-as-needed | -Wl,--no-as-needed | ||||
| c_sec | c_sec | ||||
| runtime | runtime | ||||
| mmpa | |||||
| slog | slog | ||||
| msprof | msprof | ||||
| ascend_hal_stub | ascend_hal_stub | ||||
| -Wl,--as-needed | -Wl,--as-needed | ||||
| -lrt | |||||
| -ldl | -ldl | ||||
| json | json | ||||
| ) | ) | ||||
| @@ -105,6 +105,7 @@ target_include_directories(ge_common PRIVATE | |||||
| target_link_libraries(ge_common PRIVATE | target_link_libraries(ge_common PRIVATE | ||||
| $<BUILD_INTERFACE:intf_pub> | $<BUILD_INTERFACE:intf_pub> | ||||
| static_mmpa | |||||
| -Wl,--no-as-needed | -Wl,--no-as-needed | ||||
| graph | graph | ||||
| ascend_protobuf | ascend_protobuf | ||||
| @@ -112,7 +113,6 @@ target_link_libraries(ge_common PRIVATE | |||||
| c_sec | c_sec | ||||
| error_manager | error_manager | ||||
| slog | slog | ||||
| mmpa | |||||
| -Wl,--as-needed | -Wl,--as-needed | ||||
| json | json | ||||
| -lrt | -lrt | ||||
| @@ -110,11 +110,12 @@ LOCAL_SHARED_LIBRARIES := \ | |||||
| libascend_protobuf \ | libascend_protobuf \ | ||||
| libc_sec \ | libc_sec \ | ||||
| libslog \ | libslog \ | ||||
| libmmpa \ | |||||
| libgraph \ | libgraph \ | ||||
| libregister \ | libregister \ | ||||
| liberror_manager \ | liberror_manager \ | ||||
| LOCAL_STATIC_LIBRARIES += libmmpa | |||||
| LOCAL_LDFLAGS := -lrt -ldl | LOCAL_LDFLAGS := -lrt -ldl | ||||
| include $(BUILD_HOST_SHARED_LIBRARY) | include $(BUILD_HOST_SHARED_LIBRARY) | ||||
| @@ -152,11 +153,12 @@ LOCAL_SHARED_LIBRARIES := \ | |||||
| libascend_protobuf \ | libascend_protobuf \ | ||||
| libc_sec \ | libc_sec \ | ||||
| libslog \ | libslog \ | ||||
| libmmpa \ | |||||
| libgraph \ | libgraph \ | ||||
| libregister \ | libregister \ | ||||
| liberror_manager \ | liberror_manager \ | ||||
| LOCAL_STATIC_LIBRARIES += libmmpa | |||||
| ifeq ($(device_os),android) | ifeq ($(device_os),android) | ||||
| LOCAL_LDFLAGS += -ldl | LOCAL_LDFLAGS += -ldl | ||||
| LOCAL_LDLIBS += -L$(PWD)/prebuilts/clang/linux-x86/aarch64/android-ndk-r21/sysroot/usr/lib/aarch64-linux-android/29 -llog | LOCAL_LDLIBS += -L$(PWD)/prebuilts/clang/linux-x86/aarch64/android-ndk-r21/sysroot/usr/lib/aarch64-linux-android/29 -llog | ||||
| @@ -387,12 +387,12 @@ LOCAL_SRC_FILES += $(BUILER_SRC_FILES) | |||||
| LOCAL_SRC_FILES += $(ANALYZER_SRC_FILES) | LOCAL_SRC_FILES += $(ANALYZER_SRC_FILES) | ||||
| LOCAL_STATIC_LIBRARIES := libge_memory \ | LOCAL_STATIC_LIBRARIES := libge_memory \ | ||||
| libmmpa \ | |||||
| LOCAL_SHARED_LIBRARIES := \ | LOCAL_SHARED_LIBRARIES := \ | ||||
| libc_sec \ | libc_sec \ | ||||
| libascend_protobuf \ | libascend_protobuf \ | ||||
| libslog \ | libslog \ | ||||
| libmmpa \ | |||||
| libgraph \ | libgraph \ | ||||
| libregister \ | libregister \ | ||||
| libge_common \ | libge_common \ | ||||
| @@ -451,12 +451,12 @@ LOCAL_C_INCLUDES := $(DEVICE_LOCAL_C_INCLUDES) | |||||
| LOCAL_C_INCLUDES += $(ANALYZER_LOCAL_INCLUDES) | LOCAL_C_INCLUDES += $(ANALYZER_LOCAL_INCLUDES) | ||||
| LOCAL_STATIC_LIBRARIES := libge_memory \ | LOCAL_STATIC_LIBRARIES := libge_memory \ | ||||
| libmmpa \ | |||||
| LOCAL_SHARED_LIBRARIES := \ | LOCAL_SHARED_LIBRARIES := \ | ||||
| libc_sec \ | libc_sec \ | ||||
| libascend_protobuf \ | libascend_protobuf \ | ||||
| libslog \ | libslog \ | ||||
| libmmpa \ | |||||
| libgraph \ | libgraph \ | ||||
| libregister \ | libregister \ | ||||
| libresource \ | libresource \ | ||||
| @@ -372,12 +372,12 @@ LOCAL_SRC_FILES += $(LIBCLIENT_LOCAL_SRC_FILES) | |||||
| LOCAL_STATIC_LIBRARIES := libge_memory \ | LOCAL_STATIC_LIBRARIES := libge_memory \ | ||||
| libadump_server \ | libadump_server \ | ||||
| libmsprofiler \ | libmsprofiler \ | ||||
| libmmpa \ | |||||
| LOCAL_SHARED_LIBRARIES := \ | LOCAL_SHARED_LIBRARIES := \ | ||||
| libc_sec \ | libc_sec \ | ||||
| libascend_protobuf \ | libascend_protobuf \ | ||||
| libslog \ | libslog \ | ||||
| libmmpa \ | |||||
| libgraph \ | libgraph \ | ||||
| libregister \ | libregister \ | ||||
| libge_common \ | libge_common \ | ||||