Merge branch 'develop' into pass_subgraph_generate

test=develop
PaddlePaddle · Nov 12, 2019 · 265b85b · 265b85b
2 parents 527cac0 + 4a54476
commit 265b85b
Show file tree

Hide file tree

Showing 78 changed files with 1,758 additions and 640 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ pip install paddlepaddle
 # Linux GPU cuda10cudnn7
 pip install paddlepaddle-gpu
 # Linux GPU cuda9cudnn7
-pip install paddlepaddle-gpu==1.6.0.post97
+pip install paddlepaddle-gpu==1.6.1.post97
 
 
 # For installation on other platform, refer to http://paddlepaddle.org/

diff --git a/README_cn.md b/README_cn.md
@@ -24,7 +24,7 @@ pip install paddlepaddle
 # Linux GPU cuda10cudnn7
 pip install paddlepaddle-gpu
 # Linux GPU cuda9cudnn7
-pip install paddlepaddle-gpu==1.6.0.post97
+pip install paddlepaddle-gpu==1.6.1.post97
 
 
 # 其他平台上的安装指引请参考 http://paddlepaddle.org/

diff --git a/cmake/cblas.cmake b/cmake/cblas.cmake
@@ -1,3 +1,17 @@
+# Copyright (c) 2016 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.
+
 # Find the CBlas and lapack libraries
 #
 # It will search MKLML, atlas, OpenBlas, reference-cblas in order.
@@ -8,87 +22,111 @@
 #    CBLAS_LIBS      # a list of libraries should be linked by paddle.
 #                    # Each library should be full path to object file.
 
-set(CBLAS_FOUND OFF)
+set(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/cblas_dummy.c)
+file(WRITE ${dummyfile} "const char *dummy_cblas = \"${dummyfile}\";")
+add_library(cblas STATIC ${dummyfile})
+
+if(WITH_LIBXSMM)
+  target_link_libraries(cblas ${LIBXSMM_LIBS})
+  add_dependencies(cblas extern_libxsmm)
+endif()
 
 ## Find MKLML First.
-if(WITH_MKLML AND MKLML_INC_DIR AND MKLML_LIB)
-  set(CBLAS_FOUND ON)
+if(WITH_MKLML)
+  include(external/mklml)       # download, install mklml package
   set(CBLAS_PROVIDER MKLML)
-  set(CBLAS_INC_DIR ${MKLML_INC_DIR})
+  set(CBLAS_INC_DIR  ${MKLML_INC_DIR})
   set(CBLAS_LIBRARIES ${MKLML_LIB})
 
   add_definitions(-DPADDLE_WITH_MKLML)
   add_definitions(-DLAPACK_FOUND)
 
+  add_dependencies(cblas mklml)
+  target_link_libraries(cblas dynload_mklml)
+
   message(STATUS "Found cblas and lapack in MKLML "
     "(include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
-  return()
 endif()
 
 ## Then find openblas.
-set(OPENBLAS_ROOT $ENV{OPENBLAS_ROOT} CACHE PATH "Folder contains Openblas")
-set(OPENBLAS_INCLUDE_SEARCH_PATHS
-        ${OPENBLAS_ROOT}/include
-        /usr/include
-        /usr/include/openblas
-        /usr/local/opt/openblas/include)
-set(OPENBLAS_LIB_SEARCH_PATHS
-        ${OPENBLAS_ROOT}/lib
-        /usr/lib
-        /usr/lib/blas/openblas
-        /usr/lib/openblas
-        /usr/local/opt/openblas/lib)
-
-find_path(OPENBLAS_INC_DIR NAMES cblas.h
-  PATHS ${OPENBLAS_INCLUDE_SEARCH_PATHS} NO_DEFAULT_PATH)
-find_path(OPENBLAS_LAPACKE_INC_DIR NAMES lapacke.h
-  PATHS ${OPENBLAS_INCLUDE_SEARCH_PATHS})
-find_library(OPENBLAS_LIB NAMES openblas
-  PATHS ${OPENBLAS_LIB_SEARCH_PATHS})
-
-if(OPENBLAS_LAPACKE_INC_DIR AND OPENBLAS_INC_DIR AND OPENBLAS_LIB)
-  set(CBLAS_FOUND ON)
-  set(CBLAS_PROVIDER OPENBLAS)
-  set(CBLAS_INC_DIR ${OPENBLAS_INC_DIR} ${OPENBLAS_LAPACKE_INC_DIR})
-  set(CBLAS_LIBRARIES ${OPENBLAS_LIB})
+if(NOT DEFINED CBLAS_PROVIDER)
+  set(OPENBLAS_ROOT $ENV{OPENBLAS_ROOT} CACHE PATH "Folder contains Openblas")
+  set(OPENBLAS_INCLUDE_SEARCH_PATHS
+          ${OPENBLAS_ROOT}/include
+          /usr/include
+          /usr/include/openblas
+          /usr/local/opt/openblas/include)
+  set(OPENBLAS_LIB_SEARCH_PATHS
+          ${OPENBLAS_ROOT}/lib
+          /usr/lib
+          /usr/lib/blas/openblas
+          /usr/lib/openblas
+          /usr/local/opt/openblas/lib)
 
-  add_definitions(-DPADDLE_USE_OPENBLAS)
-  add_definitions(-DLAPACK_FOUND)
+  find_path(OPENBLAS_INC_DIR NAMES cblas.h
+    PATHS ${OPENBLAS_INCLUDE_SEARCH_PATHS} NO_DEFAULT_PATH)
+  find_path(OPENBLAS_LAPACKE_INC_DIR NAMES lapacke.h
+    PATHS ${OPENBLAS_INCLUDE_SEARCH_PATHS})
+  find_library(OPENBLAS_LIB NAMES openblas
+    PATHS ${OPENBLAS_LIB_SEARCH_PATHS})
 
-  message(STATUS "Found OpenBLAS (include: ${OPENBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
-  message(STATUS "Found lapack in OpenBLAS (include: ${OPENBLAS_LAPACKE_INC_DIR})")
-  return()
-endif()
+  if(OPENBLAS_LAPACKE_INC_DIR AND OPENBLAS_INC_DIR AND OPENBLAS_LIB)
+    set(CBLAS_PROVIDER OPENBLAS)
+    set(CBLAS_INC_DIR ${OPENBLAS_INC_DIR} ${OPENBLAS_LAPACKE_INC_DIR})
+    set(CBLAS_LIBRARIES ${OPENBLAS_LIB})
 
+    add_definitions(-DPADDLE_USE_OPENBLAS)
+    add_definitions(-DLAPACK_FOUND)
 
-## Then find the reference-cblas.  www.netlib.org/blas/
-set(REFERENCE_CBLAS_ROOT $ENV{REFERENCE_CBLAS_ROOT} CACHE PATH
-  "Folder contains reference-cblas")
-set(REFERENCE_CBLAS_INCLUDE_SEARCH_PATHS
-  ${REFERENCE_CBLAS_ROOT}/include
-  /usr/include
-  /usr/include/cblas
-)
+    message(STATUS "Found OpenBLAS (include: ${OPENBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
+    message(STATUS "Found lapack in OpenBLAS (include: ${OPENBLAS_LAPACKE_INC_DIR})")
+  endif()
+endif()
 
-set(REFERENCE_CBLAS_LIB_SEARCH_PATHS
-  ${REFERENCE_CBLAS_ROOT}/lib
-  /usr/lib
-  /usr/lib/blas/reference/
-  /usr/lib/reference/
-)
+## Then find the reference-cblas if WITH_SYSTEM_BLAS.  www.netlib.org/blas/
+if(NOT DEFINED CBLAS_PROVIDER AND WITH_SYSTEM_BLAS)
+  set(REFERENCE_CBLAS_ROOT $ENV{REFERENCE_CBLAS_ROOT} CACHE PATH
+    "Folder contains reference-cblas")
+  set(REFERENCE_CBLAS_INCLUDE_SEARCH_PATHS
+    ${REFERENCE_CBLAS_ROOT}/include
+    /usr/include
+    /usr/include/cblas
+  )
+  set(REFERENCE_CBLAS_LIB_SEARCH_PATHS
+    ${REFERENCE_CBLAS_ROOT}/lib
+    /usr/lib
+    /usr/lib/blas/reference/
+    /usr/lib/reference/
+  )
 
-if(WITH_SYSTEM_BLAS)
   find_path(REFERENCE_CBLAS_INCLUDE_DIR NAMES cblas.h PATHS
         ${REFERENCE_CBLAS_INCLUDE_SEARCH_PATHS})
   find_library(REFERENCE_CBLAS_LIBRARY NAMES cblas PATHS
         ${REFERENCE_CBLAS_LIB_SEARCH_PATHS})
 
   if(REFERENCE_CBLAS_INCLUDE_DIR AND REFERENCE_CBLAS_LIBRARY)
-    set(CBLAS_FOUND ON)
-    set(CBLAS_PROVIDER REFERENCE)
+    set(CBLAS_PROVIDER REFERENCE_CBLAS)
     set(CBLAS_INC_DIR ${REFERENCE_CBLAS_INCLUDE_DIR})
     set(CBLAS_LIBRARIES ${REFERENCE_CBLAS_LIBRARY})
     add_definitions(-DPADDLE_USE_REFERENCE_CBLAS)
     message(STATUS "Found reference-cblas (include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
   endif()
 endif()
+
+## Then build openblas by external_project
+if(NOT DEFINED CBLAS_PROVIDER)
+  include(external/openblas)          # download, build, install openblas
+  set(CBLAS_PROVIDER EXTERN_OPENBLAS)
+  add_dependencies(cblas extern_openblas)
+  add_definitions(-DPADDLE_USE_OPENBLAS)
+  message(STATUS "Build OpenBLAS by External Project "
+    "(include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
+endif()
+
+# FIXME(gangliao): generate cblas target to track all high performance
+# linear algebra libraries for cc_library(xxx SRCS xxx.c DEPS cblas)
+
+include_directories(${CBLAS_INC_DIR})
+if(NOT ${CBLAS_PROVIDER} STREQUAL MKLML)
+  target_link_libraries(cblas ${CBLAS_LIBRARIES})
+endif()
diff --git a/cmake/external/brpc.cmake b/cmake/external/brpc.cmake
@@ -39,6 +39,7 @@ set(prefix_path "${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/
 ExternalProject_Add(
     extern_brpc
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     GIT_REPOSITORY  "https://github.com/apache/incubator-brpc"
     GIT_TAG         "ad00fe940b4f05225b214131959293bbed8744a0" #rdma branch's head now.
     PREFIX          ${BRPC_SOURCES_DIR}

diff --git a/cmake/external/cares.cmake b/cmake/external/cares.cmake
@@ -28,6 +28,7 @@ endif()
 
 ExternalProject_Add(
     extern_cares
+    ${SHALLOW_CLONE}
     GIT_REPOSITORY "https://github.com/c-ares/c-ares.git"
     GIT_TAG "cares-1_13_0"
     PREFIX          ${CARES_SOURCES_DIR}

diff --git a/cmake/external/cub.cmake b/cmake/external/cub.cmake
@@ -22,6 +22,7 @@ include_directories(${CUB_INCLUDE_DIR})
 ExternalProject_Add(
   extern_cub
   ${EXTERNAL_PROJECT_LOG_ARGS}
+  ${SHALLOW_CLONE}
   GIT_REPOSITORY "https://github.com/NVlabs/cub.git"
   GIT_TAG        "v1.8.0"
   PREFIX         ${CUB_SOURCE_DIR}

diff --git a/cmake/external/dlpack.cmake b/cmake/external/dlpack.cmake
@@ -22,6 +22,7 @@ include_directories(${DLPACK_INCLUDE_DIR})
 ExternalProject_Add(
   extern_dlpack
   ${EXTERNAL_PROJECT_LOG_ARGS}
+  ${SHALLOW_CLONE}
   GIT_REPOSITORY "https://github.com/dmlc/dlpack.git"
   GIT_TAG        "v0.2"
   PREFIX         ${DLPACK_SOURCE_DIR}

diff --git a/cmake/external/eigen.cmake b/cmake/external/eigen.cmake
@@ -29,6 +29,7 @@ if(WITH_AMD_GPU)
     ExternalProject_Add(
         extern_eigen3
         ${EXTERNAL_PROJECT_LOG_ARGS}
+        ${SHALLOW_CLONE}
         GIT_REPOSITORY  "https://github.com/sabreshao/hipeigen.git"
         GIT_TAG         7cb2b6e5a4b4a1efe658abb215cd866c6fb2275e
         PREFIX          ${EIGEN_SOURCE_DIR}
@@ -42,6 +43,7 @@ else()
     ExternalProject_Add(
         extern_eigen3
         ${EXTERNAL_PROJECT_LOG_ARGS}
+        ${SHALLOW_CLONE}
         GIT_REPOSITORY  "${EIGEN_GIT_REPOSITORY}"
         # eigen on cuda9.1 missing header of math_funtions.hpp
         # https://stackoverflow.com/questions/43113508/math-functions-hpp-not-found-when-using-cuda-with-eigen

diff --git a/cmake/external/gflags.cmake b/cmake/external/gflags.cmake
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(${GFLAGS_INCLUDE_DIR})
 ExternalProject_Add(
     extern_gflags
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     GIT_REPOSITORY  "https://github.com/gflags/gflags.git"
     GIT_TAG         77592648e3f3be87d6c7123eb81cbad75f9aef5a
     PREFIX          ${GFLAGS_SOURCES_DIR}

diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake
@@ -34,6 +34,7 @@ SET(GLOG_TAG "v0.3.5")
 ExternalProject_Add(
     extern_glog
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     DEPENDS gflags
     GIT_REPOSITORY  ${GLOG_REPOSITORY}
     GIT_TAG         ${GLOG_TAG}

diff --git a/cmake/external/gtest.cmake b/cmake/external/gtest.cmake
@@ -47,6 +47,7 @@ ENDIF()
 ExternalProject_Add(
     extern_gtest
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     DEPENDS         ${GTEST_DEPENDS}
     GIT_REPOSITORY  "https://github.com/google/googletest.git"
     GIT_TAG         "release-1.8.1"

diff --git a/cmake/external/leveldb.cmake b/cmake/external/leveldb.cmake
@@ -23,6 +23,7 @@ INCLUDE_DIRECTORIES(${LEVELDB_INCLUDE_DIR})
 ExternalProject_Add(
     extern_leveldb
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     PREFIX ${LEVELDB_SOURCES_DIR}
     GIT_REPOSITORY "https://github.com/google/leveldb"
     GIT_TAG v1.18

diff --git a/cmake/external/libxsmm.cmake b/cmake/external/libxsmm.cmake
@@ -23,6 +23,7 @@ SET(LIBXSMM_LIBS        "${LIBXSMM_LIBRARY_DIR}/libxsmm.a"
 
 ExternalProject_Add(
     extern_libxsmm
+    ${SHALLOW_CLONE}
     GIT_REPOSITORY  "https://github.com/hfp/libxsmm.git"
     GIT_TAG         "7cc03b5b342fdbc6b6d990b190671c5dbb8489a2"
     PREFIX          ${LIBXSMM_SOURCES_DIR}

diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake
@@ -52,6 +52,7 @@ ENDIF(NOT WIN32)
 ExternalProject_Add(
     ${MKLDNN_PROJECT}
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     DEPENDS             ${MKLDNN_DEPENDS}
     GIT_REPOSITORY      "https://github.com/intel/mkl-dnn.git"
     GIT_TAG             "aef88b7c233f48f8b945da310f1b973da31ad033"

diff --git a/cmake/external/ngraph.cmake b/cmake/external/ngraph.cmake
@@ -37,6 +37,7 @@ SET(NGRAPH_TBB_LIB         ${NGRAPH_LIB_DIR}/${NGRAPH_TBB_LIB_NAME})
 ExternalProject_Add(
     ${NGRAPH_PROJECT}
     ${EXTERNAL_PROJECT_LOG_ARGS}
+    ${SHALLOW_CLONE}
     DEPENDS                  ${MKLDNN_PROJECT} ${MKLML_PROJECT}
     GIT_REPOSITORY           ${NGRAPH_GIT_REPO}
     GIT_TAG                  ${NGRAPH_GIT_TAG}