From adee3daf4df9cc9ef78fde2a0d8edcd5480286cb Mon Sep 17 00:00:00 2001 From: liubuyu Date: Thu, 15 Oct 2020 10:53:47 +0800 Subject: [PATCH] bug fix for profiling register twice --- cmake/package.cmake | 11 ++++++++--- mindspore/ccsrc/CMakeLists.txt | 7 +++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/package.cmake b/cmake/package.cmake index df166ad438..5504dc6848 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -59,9 +59,9 @@ install( ) install( - TARGETS mindspore_gvar - DESTINATION ${INSTALL_LIB_DIR} - COMPONENT mindspore + TARGETS mindspore_gvar + DESTINATION ${INSTALL_LIB_DIR} + COMPONENT mindspore ) if (USE_GLOG) @@ -201,6 +201,11 @@ if (NOT ENABLE_GE) DESTINATION ${INSTALL_LIB_DIR} COMPONENT mindspore ) + install( + TARGETS ms_profile + DESTINATION ${INSTALL_LIB_DIR} + COMPONENT mindspore + ) elseif (ENABLE_TESTCASES) install( FILES diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 6b3a2e18f8..cf41e91725 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -231,8 +231,11 @@ if (ENABLE_D) find_library(PROFILING msprofiler ${ASCEND_RUNTIME_PATH}) find_library(PROFILING_SHARED msprof ${ASCEND_DRIVER_PATH}) find_library(OPTILING optiling ${ASCEND_OPP_PATH}) - target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${HCCL} ${DATATRANSFER} ${OPTILING}) - target_link_libraries(mindspore -Wl,--start-group proto_input ${PROFILING_SHARED} ${PROFILING} mindspore::protobuf -Wl,--end-group) + add_library(ms_profile SHARED ${PROFILING}) + set_target_properties(ms_profile PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(ms_profile -Wl,--start-group ${PROFILING_SHARED} ${PROFILING} mindspore::protobuf -Wl,--end-group) + target_link_libraries(mindspore ms_profile ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${HCCL} ${DATATRANSFER} ${OPTILING}) + target_link_libraries(mindspore -Wl,--start-group proto_input mindspore::protobuf -Wl,--end-group) elseif (CMAKE_SYSTEM_NAME MATCHES "Windows") target_link_libraries(mindspore -Wl,--start-group proto_input mindspore::protobuf mindspore::sentencepiece -Wl,--end-group) else ()