Add pslite dependency

5 years ago · a057639abc
parent bd3f3b51e4
commit a057639abc
9 changed files with 319 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -38,6 +38,10 @@ if (NOT Patch_FOUND)
 endif ()
 message(PATCH_EXECUTABLE = ${Patch_EXECUTABLE})

+if (ENABLE_AKG AND ENABLE_D)
+    add_subdirectory("${CMAKE_SOURCE_DIR}/akg")
+endif()
+
 include(${CMAKE_SOURCE_DIR}/cmake/mind_expression.cmake)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers/include)
@ -86,10 +90,6 @@ if (ENABLE_GE OR ENABLE_D OR ENABLE_TESTCASES)
    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/graphengine/third_party/fwkacllib/inc/toolchain)
 endif()

-if (ENABLE_AKG AND ENABLE_D)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/akg")
-endif()
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 add_subdirectory(mindspore/ccsrc)
 if (ENABLE_TESTCASES)
--- a/build.sh
+++ b/build.sh
@ -25,7 +25,7 @@ usage()
  echo "Usage:"
  echo "bash build.sh [-d] [-r] [-v] [-c on|off] [-t on|off] [-g on|off] [-h] [-b ge] [-m infer|train] \\"
  echo "              [-a on|off] [-Q on|off] [-p on|off] [-i] [-L] [-R] [-D on|off] [-j[n]] [-e gpu|d|cpu] \\"
-  echo "              [-P on|off] [-z [on|off]] [-M on|off] [-V 9.2|10.1] [-I] [-K] [-B on|off]"
+  echo "              [-P on|off] [-z [on|off]] [-M on|off] [-V 9.2|10.1] [-I] [-K] [-B on|off] [-E]"
  echo ""
  echo "Options:"
  echo "    -d Debug mode"
@ -55,6 +55,7 @@ usage()
  echo "    -K Compile with AKG, default on"
  echo "    -s Enable serving module, default off"
  echo "    -B Enable debugger, default off"
+  echo "    -E Enable IBVERBS for parameter server, default off"
 }

 # check value of input is 'on' or 'off'
@ -96,9 +97,10 @@ checkopts()
  ENABLE_AKG="on"
  ENABLE_SERVING="off"
  ENABLE_DEBUGGER="off"
+  ENABLE_IBVERBS="off"

  # Process the options
-  while getopts 'drvj:c:t:hsb:a:g:p:ie:m:I:LRP:Q:D:zM:V:K:sB:' opt
+  while getopts 'drvj:c:t:hsb:a:g:p:ie:m:I:LRP:Q:D:zM:V:K:sB:E' opt
  do
    OPTARG=$(echo ${OPTARG} | tr '[A-Z]' '[a-z]')
    case "${opt}" in
@ -252,6 +254,10 @@ checkopts()
        ENABLE_DEBUGGER="on"
        echo "enable debugger"
        ;;
+      E)
+        ENABLE_IBVERBS="on"
+        echo "enable IBVERBS for parameter server"
+        ;;
      *)
        echo "Unknown option ${opt}!"
        usage
@ -338,6 +344,9 @@ build_mindspore()
        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_DEBUGGER=ON"
    fi

+    if [[ "X$ENABLE_IBVERBS" = "Xon" ]]; then
+        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_IBVERBS=ON"
+    fi
    echo "${CMAKE_ARGS}"
    if [[ "X$INC_BUILD" = "Xoff" ]]; then
      cmake ${CMAKE_ARGS} ../..
--- a/cmake/external_libs/pslite.cmake
+++ b/cmake/external_libs/pslite.cmake
@ -0,0 +1,14 @@
+set(pslite_USE_STATIC_LIBS ON)
+if (${ENABLE_IBVERBS} STREQUAL "ON")
+    set(pslite_CXXFLAGS "USE_IBVERBS=1")
+endif()
+mindspore_add_pkg(pslite
+        LIBS ps
+        URL https://github.com/dmlc/ps-lite/archive/34fd45cae457d59850fdcb2066467778d0673f21.zip
+        MD5 393c0e27b68bfaf96718caa3aa96f5a3
+        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/pslite/ps_lite.patch001
+        ONLY_MAKE True
+        ONLY_MAKE_INCS include/*
+        ONLY_MAKE_LIBS build/*)
+include_directories(${pslite_INC})
+add_library(mindspore::pslite ALIAS pslite::ps)
--- a/cmake/external_libs/zeromq.cmake
+++ b/cmake/external_libs/zeromq.cmake
@ -0,0 +1,5 @@
+mindspore_add_pkg(zeromq
+        VER 4.1.4
+        HEAD_ONLY ./
+        URL  https://raw.githubusercontent.com/mli/deps/master/build/zeromq-4.1.4.tar.gz
+        MD5  a611ecc93fffeb6d058c0e6edf4ad4fb)
--- a/cmake/mind_expression.cmake
+++ b/cmake/mind_expression.cmake
@ -30,6 +30,10 @@ include(${CMAKE_SOURCE_DIR}/cmake/external_libs/flatbuffers.cmake)
 if(USE_GLOG)
    include(${CMAKE_SOURCE_DIR}/cmake/external_libs/glog.cmake)
 endif()
+if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    include(${CMAKE_SOURCE_DIR}/cmake/external_libs/zeromq.cmake)
+    include(${CMAKE_SOURCE_DIR}/cmake/external_libs/pslite.cmake)
+endif()

 find_package(Python3)
 include_directories(${Python3_INCLUDE_DIRS})
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@ -18,6 +18,7 @@ option(ENABLE_DUMP_IR "Enable dump funciton 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)

 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
    if (WIN32)
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@ -206,7 +206,7 @@ function(mindspore_add_pkg pkg_name )

    set(options )
    set(oneValueArgs URL MD5 GIT_REPOSITORY GIT_TAG VER EXE DIR HEAD_ONLY CMAKE_PATH RELEASE LIB_PATH CUSTOM_CMAKE)
-    set(multiValueArgs CMAKE_OPTION LIBS PRE_CONFIGURE_COMMAND CONFIGURE_COMMAND BUILD_OPTION INSTALL_INCS INSTALL_LIBS PATCHES SUBMODULES SOURCEMODULES)
+    set(multiValueArgs CMAKE_OPTION LIBS PRE_CONFIGURE_COMMAND CONFIGURE_COMMAND BUILD_OPTION INSTALL_INCS INSTALL_LIBS PATCHES SUBMODULES SOURCEMODULES ONLY_MAKE ONLY_MAKE_INCS ONLY_MAKE_LIBS)
    cmake_parse_arguments(PKG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )

    if (NOT PKG_LIB_PATH)
@ -290,7 +290,7 @@ function(mindspore_add_pkg pkg_name )
    foreach(_PATCH_FILE ${PKG_PATCHES})
        get_filename_component(_PATCH_FILE_NAME ${_PATCH_FILE} NAME)
        set(_LF_PATCH_FILE ${CMAKE_BINARY_DIR}/_ms_patch/${_PATCH_FILE_NAME})
-        configure_file(${_PATCH_FILE} ${_LF_PATCH_FILE} NEWLINE_STYLE LF)
+        configure_file(${_PATCH_FILE} ${_LF_PATCH_FILE} NEWLINE_STYLE LF @ONLY)

        message("patching ${${pkg_name}_SOURCE_DIR} -p1 < ${_LF_PATCH_FILE}")
        execute_process(COMMAND ${Patch_EXECUTABLE} -p1 INPUT_FILE ${_LF_PATCH_FILE}
@ -324,6 +324,16 @@ function(mindspore_add_pkg pkg_name )
                target_include_directories(${pkg_name} INTERFACE ${${pkg_name}_INC})
            endif ()

+        elseif (PKG_ONLY_MAKE)
+            __exec_cmd(COMMAND ${CMAKE_MAKE_PROGRAM} ${${pkg_name}_CXXFLAGS} -j${THNUM}
+                    WORKING_DIRECTORY ${${pkg_name}_SOURCE_DIR})
+            set(PKG_INSTALL_INCS ${PKG_ONLY_MAKE_INCS})
+            set(PKG_INSTALL_LIBS ${PKG_ONLY_MAKE_LIBS})
+            file(GLOB ${pkg_name}_INSTALL_INCS ${${pkg_name}_SOURCE_DIR}/${PKG_INSTALL_INCS})
+            file(GLOB ${pkg_name}_INSTALL_LIBS ${${pkg_name}_SOURCE_DIR}/${PKG_INSTALL_LIBS})
+            file(COPY ${${pkg_name}_INSTALL_INCS} DESTINATION ${${pkg_name}_BASE_DIR}/include)
+            file(COPY ${${pkg_name}_INSTALL_LIBS} DESTINATION ${${pkg_name}_BASE_DIR}/lib)
+
        elseif (PKG_CMAKE_OPTION)
            # in cmake
            file(MAKE_DIRECTORY ${${pkg_name}_SOURCE_DIR}/_build)
--- a/mindspore/ccsrc/CMakeLists.txt
+++ b/mindspore/ccsrc/CMakeLists.txt
@ -230,6 +230,10 @@ else ()
    target_link_libraries(_c_expression PRIVATE -Wl,--whole-archive mindspore -Wl,--no-whole-archive)
    target_link_libraries(_c_expression PRIVATE mindspore::pybind11_module)
    target_link_libraries(_c_expression PRIVATE mindspore_gvar)
+    target_link_libraries(_c_expression PRIVATE mindspore::pslite mindspore::protobuf ${zeromq_DIRPATH}/zmq_install/lib/libzmq.a)
+    if (${ENABLE_IBVERBS} STREQUAL "ON")
+        target_link_libraries(_c_expression PRIVATE ibverbs rdmacm)
+    endif()
 endif ()

 if (USE_GLOG)
--- a/third_party/patch/pslite/ps_lite.patch001
+++ b/third_party/patch/pslite/ps_lite.patch001