Merge remote-tracking branch 'paddle/develop' into softplus_activation_fuse_pass

Author: jakpiase

.gitignore

@@ -32,3 +32,6 @@ build_*
 cmake-build-*
 paddle/fluid/operators/distributed/send_recv.proto
 model_test
+
+Testing
+tools/__pycache__

README.md

@@ -85,7 +85,7 @@ We provide [English](https://www.paddlepaddle.org.cn/documentation/docs/en/guide
 ## Communication
 
 - [Github Issues](https://github.com/PaddlePaddle/Paddle/issues): bug reports, feature requests, install issues, usage issues, etc.
-- QQ discussion group: 793866180 (PaddlePaddle).
+- QQ discussion group: 441226485 (PaddlePaddle).
 - [Forums](https://ai.baidu.com/forum/topic/list/168?pageNo=1): discuss implementations, research, etc.
 
 ## Courses

README_cn.md

@@ -82,7 +82,7 @@ PaddlePaddle用户可领取**免费Tesla V100在线算力资源**，训练模型
 ## 交流与反馈
 
 - 欢迎您通过[Github Issues](https://github.com/PaddlePaddle/Paddle/issues)来提交问题、报告与建议
-- QQ群: 793866180 (PaddlePaddle)
+- QQ群: 441226485 (PaddlePaddle)
 - [论坛](https://ai.baidu.com/forum/topic/list/168): 欢迎大家在PaddlePaddle论坛分享在使用PaddlePaddle中遇到的问题和经验, 营造良好的论坛氛围
 
 ## 课程

cmake/external/boost.cmake

@@ -23,7 +23,10 @@ set(BOOST_PROJECT "extern_boost")
 # checked that the devtools package of CentOS 6 installs boost 1.41.0.
 # So we use 1.41.0 here.
 set(BOOST_VER "1.41.0")
-set(BOOST_TAR "boost_1_41_0" CACHE STRING "" FORCE)
+# boost_1_41_0_2021_10.tar.gz is almost the same with boost_1_41_0.tar.gz,
+# except in visualc.hpp i comment a warning of "unknown compiler version",
+# so if you need to change boost, you may need to block the warning similarly.
+set(BOOST_TAR "boost_1_41_0_2021_10" CACHE STRING "" FORCE)
 set(BOOST_URL "http://paddlepaddledeps.bj.bcebos.com/${BOOST_TAR}.tar.gz" CACHE STRING "" FORCE)
 
 MESSAGE(STATUS "BOOST_VERSION: ${BOOST_VER}, BOOST_URL: ${BOOST_URL}")
@@ -46,7 +49,7 @@ ExternalProject_Add(
  ${BOOST_PROJECT}
  ${EXTERNAL_PROJECT_LOG_ARGS}
  "${BOOST_DOWNLOAD_CMD}"
- URL_MD5 f891e8c2c9424f0565f0129ad9ab4aff
+ URL_MD5 51be7cc203628dc0848e97eee32d79e3
  PREFIX ${BOOST_PREFIX_DIR}
  DOWNLOAD_DIR ${BOOST_SOURCE_DIR}
  SOURCE_DIR ${BOOST_SOURCE_DIR}

cmake/external/cinn.cmake

@@ -27,7 +27,7 @@ add_definitions(-w)
 include(ExternalProject)
 set(CINN_SOURCE_DIR ${THIRD_PARTY_PATH}/CINN)
 # TODO(zhhsplendid): Modify git tag after we have release tag
-set(CINN_GIT_TAG e422c01b7875301996a2baf67a14ba61b0e6192a)
+set(CINN_GIT_TAG develop)
 set(CINN_OPTIONAL_ARGS -DPY_VERSION=${PY_VERSION} -DWITH_CUDA=${WITH_GPU} -DWITH_CUDNN=${WITH_GPU} -DPUBLISH_LIBS=ON -DWITH_TESTING=ON)
 set(CINN_BUILD_COMMAND $(MAKE) cinnapi -j)
 ExternalProject_Add(

cmake/external/dirent.cmake

@@ -0,0 +1,45 @@
+# Copyright (c) 2021 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.
+
+# Note(chenxin33): dirent.h is only exist in Linux, so get it from github when build in windows.
+# use dirent tag v1.23.2 on 09/05//2018 https://github.com/tronkko/dirent.git
+
+INCLUDE (ExternalProject)
+
+SET(DIRENT_PREFIX_DIR ${THIRD_PARTY_PATH}/dirent)
+SET(DIRENT_SOURCE_DIR ${THIRD_PARTY_PATH}/dirent/src/extern_dirent)
+SET(DIRENT_INCLUDE_DIR ${DIRENT_SOURCE_DIR}/include)
+
+include_directories(${DIRENT_INCLUDE_DIR})
+
+set(DIRENT_REPOSITORY ${GIT_URL}/tronkko/dirent)
+set(DIRENT_TAG 1.23.2)
+
+ExternalProject_Add(
+ extern_dirent
+ ${EXTERNAL_PROJECT_LOG_ARGS}
+ ${SHALLOW_CLONE}
+ GIT_REPOSITORY ${DIRENT_REPOSITORY}
+ GIT_TAG ${DIRENT_TAG}
+ PREFIX ${DIRENT_PREFIX_DIR}
+ UPDATE_COMMAND ""
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ""
+ TEST_COMMAND ""
+)
+
+add_library(dirent INTERFACE)
+
+add_dependencies(dirent extern_dirent)

cmake/external/xpu.cmake

@@ -35,7 +35,7 @@ ELSE ()
 ENDIF()
 
 SET(XPU_BASE_URL_WITHOUT_DATE "https://baidu-kunlun-product.cdn.bcebos.com/KL-SDK/klsdk-dev")
-SET(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20211020")
+SET(XPU_BASE_URL "${XPU_BASE_URL_WITHOUT_DATE}/20211107")
 SET(XPU_XRE_URL "${XPU_BASE_URL}/${XPU_XRE_DIR_NAME}.tar.gz" CACHE STRING "" FORCE)
 SET(XPU_XDNN_URL "${XPU_BASE_URL}/${XPU_XDNN_DIR_NAME}.tar.gz" CACHE STRING "" FORCE)
 SET(XPU_XCCL_URL "${XPU_BASE_URL_WITHOUT_DATE}/20210623/${XPU_XCCL_DIR_NAME}.tar.gz" CACHE STRING "" FORCE)

cmake/generic.cmake

@@ -116,6 +116,20 @@ function(find_fluid_modules TARGET_NAME)
  endif()
 endfunction(find_fluid_modules)
 
+set_property(GLOBAL PROPERTY PTEN_MODULES "")
+# find all pten modules is used for paddle static library
+# for building inference libs
+function(find_pten_modules TARGET_NAME)
+ get_filename_component(__target_path ${TARGET_NAME} ABSOLUTE)
+ string(REGEX REPLACE "^${PADDLE_SOURCE_DIR}/" "" __target_path ${__target_path})
+ string(FIND "${__target_path}" "pten" pos)
+ if(pos GREATER 1)
+ get_property(pten_modules GLOBAL PROPERTY PTEN_MODULES)
+ set(pten_modules ${pten_modules} ${TARGET_NAME})
+ set_property(GLOBAL PROPERTY PTEN_MODULES "${pten_modules}")
+ endif()
+endfunction(find_pten_modules)
+
 function(common_link TARGET_NAME)
  if (WITH_PROFILER)
  target_link_libraries(${TARGET_NAME} gperftools::profiler)
@@ -310,6 +324,7 @@ function(cc_library TARGET_NAME)
  else()
  add_library(${TARGET_NAME} STATIC ${cc_library_SRCS})
  find_fluid_modules(${TARGET_NAME})
+ find_pten_modules(${TARGET_NAME})
  endif()
  if(cc_library_DEPS)
  # Don't need link libwarpctc.so
@@ -482,6 +497,7 @@ function(nv_library TARGET_NAME)
  else()
  add_library(${TARGET_NAME} STATIC ${nv_library_SRCS})
  find_fluid_modules(${TARGET_NAME})
+ find_pten_modules(${TARGET_NAME})
  endif()
  if (nv_library_DEPS)
  add_dependencies(${TARGET_NAME} ${nv_library_DEPS})
@@ -572,6 +588,7 @@ function(hip_library TARGET_NAME)
  else()
  hip_add_library(${TARGET_NAME} STATIC ${hip_library_SRCS})
  find_fluid_modules(${TARGET_NAME})
+ find_pten_modules(${TARGET_NAME})
  endif()
  if (hip_library_DEPS)
  add_dependencies(${TARGET_NAME} ${hip_library_DEPS})

cmake/operators.cmake

@@ -185,6 +185,7 @@ function(op_library TARGET)
  list(REMOVE_ITEM hip_srcs "cholesky_op.cu")
  list(REMOVE_ITEM hip_srcs "matrix_rank_op.cu")
  list(REMOVE_ITEM hip_srcs "svd_op.cu")
+ list(REMOVE_ITEM hip_srcs "eigvalsh_op.cu")
  list(REMOVE_ITEM hip_srcs "qr_op.cu")
  list(REMOVE_ITEM hip_srcs "eigh_op.cu")
  list(REMOVE_ITEM hip_srcs "multinomial_op.cu")

cmake/third_party.cmake

@@ -331,7 +331,7 @@ if (WITH_PSCORE)
 
  include(external/libmct) # download, build, install libmct
  list(APPEND third_party_deps extern_libmct)
- 
+
  if (WITH_HETERPS)
  include(external/rocksdb) # download, build, install libmct
  list(APPEND third_party_deps extern_rocksdb)
@@ -378,4 +378,9 @@ if (WITH_POCKETFFT)
  add_definitions(-DPADDLE_WITH_POCKETFFT)
 endif (WITH_POCKETFFT)
 
+if (WIN32)
+ include(external/dirent)
+ list(APPEND third_party_deps extern_dirent)
+endif (WIN32)
+
 add_custom_target(third_party ALL DEPENDS ${third_party_deps})