Optimize rdma compiling option

cmake/options.cmake

@@ -17,7 +17,7 @@ option(ENABLE_DUMP_IR "Enable dump function graph ir, default on" ON)
 option(ENABLE_MPI "enable mpi" OFF)
 option(ENABLE_AKG "enable akg" OFF)
 option(ENABLE_DEBUGGER "enable debugger" OFF)
-option(ENABLE_IBVERBS "enable IBVERBS for parameter server" OFF)
+option(ENABLE_RDMA "enable RDMA for RPC" OFF)
 option(ENABLE_PYTHON "Enable python" ON)
 option(ENABLE_ACL "enable acl" OFF)
 option(ENABLE_GLIBCXX "enable_glibcxx" OFF)

mindspore/ccsrc/CMakeLists.txt

@@ -549,9 +549,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 else()
     if(ENABLE_CPU AND NOT WIN32)
         target_link_libraries(mindspore PUBLIC proto_input mindspore::protobuf mindspore::eigen mindspore::json)
-        if(${ENABLE_IBVERBS} STREQUAL "ON")
-            target_link_libraries(mindspore PUBLIC ibverbs rdmacm)
-        endif()
     endif()
     target_link_libraries(_c_expression PRIVATE -Wl,--whole-archive mindspore proto_input -Wl,--no-whole-archive
             mindspore_core mindspore_common mindspore_backend)

mindspore/ccsrc/minddata/dataset/CMakeLists.txt

@@ -254,9 +254,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 else()
     target_link_libraries(_c_dataengine PRIVATE _c_mindrecord)
     if(ENABLE_CPU AND NOT WIN32)
-        if(${ENABLE_IBVERBS} STREQUAL "ON")
-            target_link_libraries(_c_dataengine PRIVATE ibverbs rdmacm)
-        endif()
         target_link_libraries(_c_dataengine PRIVATE ps_cache)
     endif()
 endif()

scripts/build/build_mindspore.sh

@@ -95,8 +95,8 @@ build_mindspore()
         CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_DEBUGGER=ON"
     fi
 
-    if [[ "X$ENABLE_IBVERBS" = "Xon" ]]; then
-        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_IBVERBS=ON"
+    if [[ "X$ENABLE_RDMA" = "Xon" ]]; then
+        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_RDMA=ON"
     fi
     if [[ "X$ENABLE_HIDDEN" = "Xoff" ]]; then
         CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_HIDDEN=OFF"

scripts/build/default_options.sh

@@ -47,7 +47,7 @@ init_default_options()
   export ENABLE_ACL="off"
   export ENABLE_D="off"
   export ENABLE_DEBUGGER="on"
-  export ENABLE_IBVERBS="off"
+  export ENABLE_RDMA="off"
   export ENABLE_PYTHON="on"
   export ENABLE_GPU="off"
   export ENABLE_VERBOSE="off"

scripts/build/process_options.sh

@@ -20,7 +20,7 @@ set -e
 process_options()
 {
   # Process the options
-  while getopts 'drvj:c:t:hb:s:a:g:p:ie:l:I:RP:D:zM:V:K:B:En:A:S:k:W:F:H:L:yG:f' opt
+  while getopts 'drvj:c:t:hb:s:a:g:p:ie:l:I:RP:D:zM:V:K:B:E:n:A:S:k:W:F:H:L:yG:f' opt
   do
     CASE_SENSIVE_ARG=${OPTARG}
     OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]')
@@ -89,8 +89,9 @@ process_options()
       B)
         build_option_proc_upper_b ;;
       E)
-        export ENABLE_IBVERBS="on"
-        echo "enable IBVERBS for parameter server" ;;
+        check_on_off $OPTARG E
+        export ENABLE_RDMA="$OPTARG"
+        echo "enable RDMA for RPC $ENABLE_RDMA" ;;
       A)
         build_option_proc_upper_a ;;
       W)