m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove all msprof, changed to static msprof

Browse Source
pull/576/head
taoxiangdong 4 years ago
parent 71d2fb4d58
commit 1f2d63f2b9
6 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File

14
CMakeLists.txt
Unescape View File

@ -71,7 +71,7 @@ if (ENABLE_OPEN_SRC)
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(static_mmpa libmmpa.a ${GE_LIB_PATH}) find_module(static_mmpa libmmpa.a ${GE_LIB_PATH})
find_module(msprof libmsprof.so ${GE_LIB_PATH}) find_module(msprofiler libmsprofiler.a ${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})
find_module(runtime libruntime.so ${GE_LIB_PATH}) find_module(runtime libruntime.so ${GE_LIB_PATH})
@ -80,20 +80,19 @@ if (ENABLE_OPEN_SRC)
find_module(error_manager liberror_manager.so ${GE_LIB_PATH}) find_module(error_manager liberror_manager.so ${GE_LIB_PATH})
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_fwk libmsprofiler_fwk.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(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})
if(PLATFORM STREQUAL "train") if(PLATFORM STREQUAL "train")
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})
find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR}) find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR})
find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR}) find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR})
find_module(resource libresource.so ${ASCEND_RUNTIME_DIR}) find_module(resource libresource.so ${ASCEND_RUNTIME_DIR})
find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR})
find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR}) find_module(msprofiler_fwk libmsprofiler_fwk.a ${ASCEND_RUNTIME_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)
if(PRODUCT STREQUAL "flr3") if(PRODUCT STREQUAL "flr3")
message(FATAL_ERROR "This platform is not supported in train mode, build terminated") message(FATAL_ERROR "This platform is not supported in train mode, build terminated")
@ -108,18 +107,15 @@ if (ENABLE_OPEN_SRC)
find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR}) find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR})
#find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) #find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR})
if(PRODUCT STREQUAL "flr3") if(PRODUCT STREQUAL "flr3")
find_module(msprof libmsprof.so ${ASCEND_DRIVER_SHARE_DIR})
elseif(PRODUCT STREQUAL "flr1") elseif(PRODUCT STREQUAL "flr1")
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(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR})
elseif(PRODUCT STREQUAL "flr2") elseif(PRODUCT STREQUAL "flr2")
# flr2 ascend_hal_stub limsprof ? # flr2 ascend_hal_stub limsprof ?
else() else()
find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}) find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR})
find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR})
endif() endif()
elseif(PLATFORM STREQUAL "all") elseif(PLATFORM STREQUAL "all")
find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR}) find_module(msprofiler libmsprofiler.a ${ASCEND_DRIVER_COMMON_DIR})
find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR}) find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR})
find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR}) find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR})
find_module(runtime libruntime.so ${ASCEND_ACL_DIR}) find_module(runtime libruntime.so ${ASCEND_ACL_DIR})
@ -127,7 +123,7 @@ if (ENABLE_OPEN_SRC)
find_module(resource libresource.so ${ASCEND_ATC_DIR}) find_module(resource libresource.so ${ASCEND_ATC_DIR})
find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR})
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_fwk libmsprofiler_fwk.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()

2
ge/CMakeLists.txt
Unescape View File

@ -779,7 +779,7 @@ target_link_libraries(opensrc_ascendcl PRIVATE
register_static register_static
error_manager_static error_manager_static
adump_server adump_server
msprofiler_fwk msprofiler
-Wl,--no-whole-archive -Wl,--no-whole-archive
-Wl,--no-as-needed -Wl,--no-as-needed
c_sec c_sec

10
ge/client/module.mk
Unescape View File

@ -68,9 +68,9 @@ LOCAL_SHARED_LIBRARIES := \
libgraph \ libgraph \
libregister \ libregister \
libge_compiler \ libge_compiler \
libge_common \ libge_common
libmsprof
LOCAL_STATIC_LIBRARIES += libmsprofiler_fwk \
LOCAL_LDFLAGS := -lrt -ldl LOCAL_LDFLAGS := -lrt -ldl
@ -103,8 +103,10 @@ LOCAL_SHARED_LIBRARIES := \
libregister \ libregister \
libruntime \ libruntime \
libge_compiler \ libge_compiler \
libge_common \ libge_common
libmsprof
LOCAL_STATIC_LIBRARIES += libmsprofiler_fwk \
LOCAL_LDFLAGS := -lrt -ldl LOCAL_LDFLAGS := -lrt -ldl

1
ge/executor/CMakeLists.txt
Unescape View File

@ -245,7 +245,6 @@ target_link_libraries(ge_executor_shared PRIVATE
mmpa mmpa
graph graph
register register
msprof
error_manager error_manager
ascend_hal_stub ascend_hal_stub
ascend_protobuf ascend_protobuf

4
ge/executor/module.mk
Unescape View File

@ -178,7 +178,6 @@ local_ge_executor_shared_library := \
libmmpa \ libmmpa \
libgraph \ libgraph \
libregister \ libregister \
libmsprof \
liberror_manager \ liberror_manager \
local_ge_executor_ldflags := -lrt -ldl \ local_ge_executor_ldflags := -lrt -ldl \
@ -235,7 +234,6 @@ LOCAL_SHARED_LIBRARIES := \
libmmpa \ libmmpa \
libgraph \ libgraph \
libregister \ libregister \
libmsprof \
liberror_manager \ liberror_manager \
stub/libascend_hal \ stub/libascend_hal \
@ -273,7 +271,6 @@ LOCAL_SHARED_LIBRARIES := \
libruntime \ libruntime \
libslog \ libslog \
libmmpa \ libmmpa \
libmsprof \
LOCAL_LDFLAGS += $(local_ge_executor_ldflags) LOCAL_LDFLAGS += $(local_ge_executor_ldflags)
@ -305,7 +302,6 @@ LOCAL_SHARED_LIBRARIES := \
libruntime \ libruntime \
libslog \ libslog \
libmmpa \ libmmpa \
libmsprof \
ifeq ($(device_os),android) ifeq ($(device_os),android)
LOCAL_LDFLAGS += -ldl LOCAL_LDFLAGS += -ldl

5
ge/ge_runner.mk
Unescape View File

@ -372,7 +372,7 @@ LOCAL_SRC_FILES += $(LIBCLIENT_LOCAL_SRC_FILES)
LOCAL_STATIC_LIBRARIES := libge_memory \ LOCAL_STATIC_LIBRARIES := libge_memory \
libadump_server \ libadump_server \
libmsprofiler \ libmsprofiler_fwk \
libmmpa \ libmmpa \
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
@ -382,7 +382,6 @@ LOCAL_SHARED_LIBRARIES := \
libgraph \ libgraph \
libregister \ libregister \
libge_common \ libge_common \
libmsprof \
liberror_manager \ liberror_manager \
LOCAL_LDFLAGS := -lrt -ldl LOCAL_LDFLAGS := -lrt -ldl
@ -464,7 +463,6 @@ LOCAL_SHARED_LIBRARIES := \
libc_sec \ libc_sec \
libslog \ libslog \
libmmpa \ libmmpa \
libmsprof \
LOCAL_LDFLAGS := -lrt -ldl LOCAL_LDFLAGS := -lrt -ldl
@ -497,7 +495,6 @@ LOCAL_SHARED_LIBRARIES := \
libc_sec \ libc_sec \
libslog \ libslog \
libmmpa \ libmmpa \
libmsprof \
LOCAL_LDFLAGS := -lrt -ldl LOCAL_LDFLAGS := -lrt -ldl

Write Preview
Loading…
Cancel
Save