merge to local

CMakeLists.txt

@@ -75,6 +75,7 @@ option(WITH_INFERENCE_API_TEST   "Test fluid inference high-level api interface"
 option(WITH_SYSTEM_BLAS   "Use system blas library"           OFF)
 option(PY_VERSION       "Compile PaddlePaddle with python3 support"     ${PY_VERSION})
 option(WITH_FAST_MATH   "Make use of fast math library, might affect the precision to some extent" ON)
+option(WITH_WBAES       "Compile PaddlePaddle with WBAES support"       ON)
 
 # PY_VERSION
 if(NOT PY_VERSION)
@@ -148,6 +149,7 @@ include(external/dlpack)
 include(external/snappy)    # download snappy
 include(external/snappystream) # download snappystream
 include(external/warpctc)   # download, build, install warpctc
+include(external/wbaes)     # download wbaes
 
 if (NOT WIN32)
 # there is no official support of nccl, cupti in windows

cmake/configure.cmake

@@ -157,3 +157,7 @@ endif(WITH_BRPC_RDMA)
 if(ON_INFER)
     add_definitions(-DPADDLE_ON_INFERENCE)
 endif(ON_INFER)
+
+if(WITH_WBAES)
+    add_definitions(-DPADDLE_WITH_WBAES)
+endif(WITH_WBAES)

cmake/external/dgc.cmake

@@ -34,7 +34,7 @@ ExternalProject_Add(
     BUILD_IN_SOURCE 1
 )
 
-ADD_LIBRARY(dgc SHARED IMPORTED GLOBAL)
+ADD_LIBRARY(dgc STATIC IMPORTED GLOBAL)
 SET_PROPERTY(TARGET dgc PROPERTY IMPORTED_LOCATION ${DGC_LIBRARIES})
 ADD_DEPENDENCIES(dgc extern_dgc)
 

cmake/external/protobuf.cmake

@@ -201,7 +201,7 @@ FUNCTION(build_protobuf TARGET_NAME BUILD_FOR_HOST)
         SET(OPTIONAL_ARGS ${OPTIONAL_ARGS} "-DCMAKE_GENERATOR_PLATFORM=x64")
     ENDIF()
 
-    SET(PROTOBUF_REPO "https://github.com/google/protobuf.git")
+    SET(PROTOBUF_REPO "https://github.com/protocolbuffers/protobuf.git")
     SET(PROTOBUF_TAG "9f75c5aa851cd877fb0d93ccc31b8567a6706546")
 
     ExternalProject_Add(

cmake/external/wbaes.cmake

@@ -0,0 +1,71 @@
+# Copyright (c) 2019 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+IF(NOT ${WITH_WBAES})
+    return()
+ENDIF(NOT ${WITH_WBAES})
+
+INCLUDE(ExternalProject)
+SET(WBAES_DST_DIR       "wbaes")
+SET(WBAES_INSTALL_ROOT  "${THIRD_PARTY_PATH}/install")
+SET(WBAES_INSTALL_DIR   ${WBAES_INSTALL_ROOT}/${WBAES_DST_DIR})
+SET(WBAES_ROOT          ${WBAES_INSTALL_DIR})
+SET(WBAES_INC_DIR       ${WBAES_ROOT}/include)
+SET(WBAES_LIB_DIR       ${WBAES_ROOT}/lib)
+
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${WBAES_ROOT}/lib")
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+IF(APPLE)
+    SET(WBAES_TAG   "v1.0.0" CACHE STRING "" FORCE)
+    SET(WBAES_URL   "http://paddlepaddledeps.bj.bcebos.com/wbaes-sdk.mac.${WBAES_TAG}.tgz" CACHE STRING "" FORCE)
+    SET(WBAES_LIB   ${WBAES_LIB_DIR}/libwbaes.dylib)
+    SET(WBAES_SHARED_LIB   ${WBAES_LIB_DIR}/libwbaes.dylib)
+ELSEIF(WIN32)
+    SET(WBAES_TAG   "v1.0.0" CACHE STRING "" FORCE)
+    SET(WBAES_URL   "http://paddlepaddledeps.bj.bcebos.com/wbaes-sdk.windows-x64.${WBAES_TAG}.tgz" CACHE STRING "" FORCE)
+    SET(WBAES_LIB   ${WBAES_LIB_DIR}/libwbaes.lib)
+    SET(WBAES_SHARED_LIB   ${WBAES_LIB_DIR}/libwbaes.dll)
+ELSE()
+    SET(WBAES_TAG   "v1.0.2" CACHE STRING "" FORCE)
+    SET(WBAES_URL   "http://paddlepaddledeps.bj.bcebos.com/wbaes-sdk.linux-x86_64.${WBAES_TAG}.tgz" CACHE STRING "" FORCE)
+    SET(WBAES_LIB   ${WBAES_LIB_DIR}/libwbaes.so)
+    SET(WBAES_SHARED_LIB   ${WBAES_LIB_DIR}/libwbaes.so)
+ENDIF()
+
+SET(WBAES_PROJECT       "extern_wbaes")
+MESSAGE(STATUS "WBAES_URL: ${WBAES_URL}, WBAES_LIB: ${WBAES_LIB}")
+SET(WBAES_SOURCE_DIR    "${THIRD_PARTY_PATH}/wbaes") 
+SET(WBAES_DOWNLOAD_DIR  "${WBAES_SOURCE_DIR}/src/${WBAES_PROJECT}")
+
+ExternalProject_Add(
+    ${WBAES_PROJECT}
+    ${EXTERNAL_PROJECT_LOG_ARGS}
+    PREFIX                  ${WBAES_SOURCE_DIR}
+    URL                     ${WBAES_URL}
+    DOWNLOAD_DIR            ${WBAES_DOWNLOAD_DIR}
+    DOWNLOAD_NO_PROGRESS    1
+    CONFIGURE_COMMAND       ""
+    BUILD_COMMAND           ""
+    INSTALL_COMMAND         ""
+        ${CMAKE_COMMAND} -E copy_directory ${WBAES_DOWNLOAD_DIR}/include ${WBAES_INC_DIR} &&
+        ${CMAKE_COMMAND} -E copy_directory ${WBAES_DOWNLOAD_DIR}/lib ${WBAES_LIB_DIR}
+)
+
+INCLUDE_DIRECTORIES(${WBAES_INC_DIR})
+
+ADD_LIBRARY(wbaes SHARED IMPORTED GLOBAL)
+SET_PROPERTY(TARGET wbaes PROPERTY IMPORTED_LOCATION ${WBAES_LIB})
+SET_PROPERTY(TARGET wbaes PROPERTY IMPORTED_NO_SONAME 1)
+ADD_DEPENDENCIES(wbaes ${WBAES_PROJECT})

cmake/generic.cmake

@@ -264,6 +264,14 @@ function(cc_library TARGET_NAME)
         list(REMOVE_ITEM cc_library_DEPS warpctc)
         add_dependencies(${TARGET_NAME} warpctc)
       endif()
+      # Only deps libwbaes.so, not link
+      if("${cc_library_DEPS};" MATCHES "wbaes;")
+        list(REMOVE_ITEM cc_library_DEPS wbaes)
+        if(NOT "${TARGET_NAME}" MATCHES "dynload_wbaes")
+          list(APPEND cc_library_DEPS dynload_wbaes)
+        endif()
+        add_dependencies(${TARGET_NAME} wbaes)
+      endif()
       # Only deps libmklml.so, not link
       if("${cc_library_DEPS};" MATCHES "mklml;")
         list(REMOVE_ITEM cc_library_DEPS mklml)

cmake/inference_lib.cmake

@@ -170,6 +170,14 @@ copy(snappystream_lib
         DSTS ${dst_dir} ${dst_dir}/lib
         DEPS snappystream)
 
+if (WITH_WBAES)
+    set(dst_dir "${FLUID_INSTALL_DIR}/third_party/install/wbaes")
+    copy(wbaes_lib
+            SRCS ${WBAES_INC_DIR} ${WBAES_LIB}
+            DSTS ${dst_dir} ${dst_dir}/lib
+            DEPS wbaes)
+endif ()
+
 set(dst_dir "${FLUID_INSTALL_DIR}/third_party/install/zlib")
 copy(zlib_lib
         SRCS ${ZLIB_INCLUDE_DIR} ${ZLIB_LIBRARIES}