diff --git a/graphengine b/graphengine index 88049a688b..7a75f024d5 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit 88049a688bb246580768e9acd99999339984fdf6 +Subproject commit 7a75f024d5a70c51b6428008587c4125bc015349 diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index a80eeb0a90..69375d7631 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -132,7 +132,7 @@ if (ENABLE_D) include_directories("${CMAKE_BINARY_DIR}/backend/kernel_compiler/aicpu") file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "backend/kernel_compiler/aicpu/proto/*.proto") ms_protobuf_generate(PROTOSRCS PROTOHDRS ${PROTO_IN}) - + file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "runtime/device/ascend/dump/proto/*.proto") ms_protobuf_generate(DUMP_PROTOSRCS PROTOHDRS ${PROTO_DUMP}) @@ -176,8 +176,6 @@ endforeach () set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME) add_library(mindspore STATIC ${SUB_OBJECTS_SRC}) -target_link_libraries(proto_input mindspore::protobuf) - target_link_libraries(mindspore mindspore_core) if (ENABLE_DEBUGGER) @@ -185,7 +183,6 @@ if (ENABLE_DEBUGGER) target_link_libraries(proto_input mindspore::grpc++) endif() -target_link_libraries(mindspore proto_input) target_link_libraries(mindspore securec mindspore::flatbuffers) if (NOT WIN32) @@ -230,13 +227,13 @@ if (ENABLE_D) find_library(RUNTIME_LIB runtime ${ASCEND_RUNTIME_PATH}) find_library(TSDCLIENT tsdclient HINTS ${ASCEND_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) find_library(DATATRANSFER datatransfer HINTS ${ASCEND_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) - find_library(PROFILING msprof ${ASCEND_DRIVER_PATH}) - target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${PROFILING} ${HCCL} ${DATATRANSFER}) -endif() - -# link protobuf -if (ENABLE_D) - target_link_libraries(mindspore mindspore::protobuf) + find_library(PROFILING msprofiler ${ASCEND_RUNTIME_PATH}) + target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${HCCL} ${DATATRANSFER}) + target_link_libraries(mindspore -Wl,--start-group proto_input ${PROFILING} 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 () + target_link_libraries(mindspore -Wl,--start-group proto_input mindspore::protobuf -Wl,--end-group) endif() # set c_expression building @@ -278,7 +275,7 @@ else () target_link_libraries(mindspore ibverbs rdmacm) endif() endif() - target_link_libraries(_c_expression PRIVATE -Wl,--whole-archive mindspore -Wl,--no-whole-archive) + target_link_libraries(_c_expression PRIVATE -Wl,--whole-archive mindspore proto_input -Wl,--no-whole-archive) target_link_libraries(_c_expression PRIVATE mindspore::pybind11_module) target_link_libraries(_c_expression PRIVATE mindspore_gvar) endif () @@ -287,11 +284,6 @@ if (USE_GLOG) target_link_libraries(_c_expression PRIVATE mindspore::glog) endif () -if (ENABLE_DUMP_PROTO) - message("add protobuf lib to c_expression") - target_link_libraries(_c_expression PRIVATE mindspore::protobuf) -endif () - if (ENABLE_GPU) message("add gpu lib to c_expression") target_link_libraries(_c_expression PRIVATE gpu_cuda_lib gpu_queue cublas @@ -324,7 +316,7 @@ add_library(inference SHARED ${LOAD_ONNX_SRC} ) target_link_libraries(inference PRIVATE ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY} - -Wl,--whole-archive mindspore -Wl,--no-whole-archive mindspore_gvar mindspore::protobuf) + -Wl,--whole-archive mindspore proto_input -Wl,--no-whole-archive mindspore_gvar) if (ENABLE_D) target_link_libraries(_c_expression PRIVATE ${ASCEND_PATH}/fwkacllib/lib64/libadump_server.a) diff --git a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt index becdaeeccc..3a0ccd3627 100644 --- a/mindspore/ccsrc/minddata/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -139,20 +139,21 @@ endif() target_link_libraries(_c_dataengine PRIVATE mindspore mindspore_gvar) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (ENABLE_PYTHON) - target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module ${PYTHON_LIBRARIES} mindspore::protobuf ${SECUREC_LIBRARY}) + target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY}) else() - target_link_libraries(_c_dataengine PRIVATE mindspore::protobuf ${SECUREC_LIBRARY}) + target_link_libraries(_c_dataengine PRIVATE ${SECUREC_LIBRARY}) endif() else() set(ICU_LIB mindspore::icuuc mindspore::icudata mindspore::icui18n) if (ENABLE_PYTHON) - target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module -ldl mindspore::protobuf ${SECUREC_LIBRARY}) + target_link_libraries(_c_dataengine PRIVATE mindspore::pybind11_module -ldl ${SECUREC_LIBRARY}) else() - target_link_libraries(_c_dataengine PRIVATE -ldl mindspore::protobuf ${SECUREC_LIBRARY}) + target_link_libraries(_c_dataengine PRIVATE -ldl ${SECUREC_LIBRARY}) endif() + target_link_libraries(_c_dataengine PUBLIC mindspore::sentencepiece) endif() target_link_libraries(_c_dataengine PUBLIC mindspore::jpeg_turbo mindspore::turbojpeg mindspore::opencv_core mindspore::opencv_imgcodecs - mindspore::opencv_imgproc mindspore::tinyxml2 mindspore::sentencepiece mindspore::sentencepiece_train ${ICU_LIB}) + mindspore::opencv_imgproc mindspore::tinyxml2 mindspore::sentencepiece_train ${ICU_LIB}) if (ENABLE_GPUQUE) target_link_libraries(_c_dataengine PRIVATE gpu_queue ${CUDNN_LIBRARY_PATH} @@ -171,7 +172,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") else() target_link_libraries(_c_dataengine PRIVATE _c_mindrecord) if (ENABLE_CPU AND (ENABLE_D OR ENABLE_GPU)) - target_link_libraries(_c_dataengine PRIVATE mindspore::pslite mindspore::protobuf ${zeromq_DIRPATH}/zmq_install/lib/libzmq.a) + target_link_libraries(_c_dataengine PRIVATE mindspore::pslite ${zeromq_DIRPATH}/zmq_install/lib/libzmq.a) if (${ENABLE_IBVERBS} STREQUAL "ON") target_link_libraries(_c_dataengine PRIVATE ibverbs rdmacm) endif()