Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
afeixing77
Paddle
提交
b28afef7
P
Paddle
项目概览
afeixing77
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b28afef7
编写于
2月 20, 2019
作者:
T
Tao Luo
提交者:
GitHub
2月 20, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15801 from luotao1/legacy_option
remove Legacy compiler option
上级
a0666b05
f52d3728
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
3 addition
and
250 deletion
+3
-250
CMakeLists.txt
CMakeLists.txt
+0
-41
cmake/configure.cmake
cmake/configure.cmake
+0
-74
cmake/cuda.cmake
cmake/cuda.cmake
+0
-3
cmake/external/openblas.cmake
cmake/external/openblas.cmake
+0
-5
cmake/hip.cmake
cmake/hip.cmake
+0
-12
cmake/rdma.cmake
cmake/rdma.cmake
+0
-82
cmake/tensorrt.cmake
cmake/tensorrt.cmake
+0
-1
paddle/contrib/float16/run_float16_demo.sh
paddle/contrib/float16/run_float16_demo.sh
+0
-2
paddle/fluid/train/demo/README.md
paddle/fluid/train/demo/README.md
+0
-1
paddle/scripts/README.md
paddle/scripts/README.md
+0
-2
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+3
-22
paddle/scripts/paddle_docker_build.sh
paddle/scripts/paddle_docker_build.sh
+0
-2
paddle/scripts/submit_local.sh.in
paddle/scripts/submit_local.sh.in
+0
-3
未找到文件。
CMakeLists.txt
浏览文件 @
b28afef7
...
@@ -54,23 +54,12 @@ option(WITH_NGRAPH "Compile PaddlePaddle with nGraph support." OFF)
...
@@ -54,23 +54,12 @@ option(WITH_NGRAPH "Compile PaddlePaddle with nGraph support." OFF)
option
(
WITH_DSO
"Compile PaddlePaddle with dynamic linked CUDA"
ON
)
option
(
WITH_DSO
"Compile PaddlePaddle with dynamic linked CUDA"
ON
)
option
(
WITH_TESTING
"Compile PaddlePaddle with unit testing"
OFF
)
option
(
WITH_TESTING
"Compile PaddlePaddle with unit testing"
OFF
)
option
(
WITH_PYTHON
"Compile PaddlePaddle with python interpreter"
ON
)
option
(
WITH_PYTHON
"Compile PaddlePaddle with python interpreter"
ON
)
option
(
WITH_DOUBLE
"Compile PaddlePaddle with double precision"
OFF
)
option
(
WITH_RDMA
"Compile PaddlePaddle with RDMA support"
OFF
)
option
(
WITH_TIMER
"Compile PaddlePaddle with stats timer"
OFF
)
option
(
WITH_PROFILER
"Compile PaddlePaddle with GPU profiler and gperftools"
OFF
)
option
(
WITH_PROFILER
"Compile PaddlePaddle with GPU profiler and gperftools"
OFF
)
option
(
WITH_JEMALLOC
"Compile PaddlePaddle with jemalloc"
OFF
)
option
(
WITH_JEMALLOC
"Compile PaddlePaddle with jemalloc"
OFF
)
option
(
WITH_DOC
"Compile PaddlePaddle with documentation"
OFF
)
option
(
WITH_COVERAGE
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
WITH_COVERAGE
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
ON_TRAVIS
"Exclude special unit test on Travis CI"
OFF
)
option
(
WITH_FLUID_ONLY
"Compile PaddlePaddle fluid only"
OFF
)
option
(
WITH_GOLANG
"Compile PaddlePaddle with GOLANG"
OFF
)
option
(
GLIDE_INSTALL
"Download and install go dependencies "
ON
)
option
(
WITH_DISTRIBUTE
"Compile with distributed support"
OFF
)
option
(
WITH_DISTRIBUTE
"Compile with distributed support"
OFF
)
option
(
WITH_PSLIB
"Compile with pslib support"
OFF
)
option
(
WITH_PSLIB
"Compile with pslib support"
OFF
)
option
(
USE_EIGEN_FOR_BLAS
"Use matrix multiplication in Eigen"
OFF
)
option
(
EIGEN_USE_THREADS
"Compile with multi-threaded Eigen"
OFF
)
option
(
WITH_ARM_FP16
"Use half precision support on armv8.2-a cpu"
OFF
)
option
(
WITH_CONTRIB
"Compile the third-party contributation"
OFF
)
option
(
WITH_CONTRIB
"Compile the third-party contributation"
OFF
)
option
(
REPLACE_ENFORCE_GLOG
"Replace PADDLE_ENFORCE with glog/CHECK for better debug."
OFF
)
option
(
REPLACE_ENFORCE_GLOG
"Replace PADDLE_ENFORCE with glog/CHECK for better debug."
OFF
)
option
(
WITH_ANAKIN
"Compile with Anakin library"
OFF
)
option
(
WITH_ANAKIN
"Compile with Anakin library"
OFF
)
...
@@ -105,8 +94,6 @@ endif()
...
@@ -105,8 +94,6 @@ endif()
if
(
WIN32
)
if
(
WIN32
)
set
(
WITH_DISTRIBUTE OFF CACHE STRING
set
(
WITH_DISTRIBUTE OFF CACHE STRING
"Disable DISTRIBUTE when compiling for Windows"
FORCE
)
"Disable DISTRIBUTE when compiling for Windows"
FORCE
)
set
(
WITH_FLUID_ONLY ON CACHE STRING
"Enable FLUID_ONLY when compiling for Windows"
FORCE
)
endif
()
endif
()
set
(
THIRD_PARTY_PATH
"
${
CMAKE_BINARY_DIR
}
/third_party"
CACHE STRING
set
(
THIRD_PARTY_PATH
"
${
CMAKE_BINARY_DIR
}
/third_party"
CACHE STRING
...
@@ -225,7 +212,6 @@ include(generic) # simplify cmake module
...
@@ -225,7 +212,6 @@ include(generic) # simplify cmake module
include
(
package
)
# set paddle packages
include
(
package
)
# set paddle packages
include
(
ccache
)
# set ccache for compilation
include
(
ccache
)
# set ccache for compilation
include
(
util
)
# set unittest and link libs
include
(
util
)
# set unittest and link libs
include
(
rdma
)
# set rdma libraries
include
(
version
)
# set PADDLE_VERSION
include
(
version
)
# set PADDLE_VERSION
include
(
coveralls
)
# set code coverage
include
(
coveralls
)
# set code coverage
include
(
inference_lib
)
# add paddle fluid inference libraries
include
(
inference_lib
)
# add paddle fluid inference libraries
...
@@ -233,38 +219,11 @@ include(inference_lib) # add paddle fluid inference libraries
...
@@ -233,38 +219,11 @@ include(inference_lib) # add paddle fluid inference libraries
include_directories
(
"
${
PADDLE_SOURCE_DIR
}
"
)
include_directories
(
"
${
PADDLE_SOURCE_DIR
}
"
)
set
(
EXTERNAL_LIBS
gflags
glog
${
CBLAS_LIBRARIES
}
protobuf
zlib
${
PYTHON_LIBRARIES
}
)
if
(
WITH_PSLIB
)
list
(
APPEND EXTERNAL_LIBS pslib
)
list
(
APPEND EXTERNAL_LIBS pslib_brpc
)
list
(
APPEND EXTERNAL_LIBS libmct
)
endif
(
WITH_PSLIB
)
if
(
WITH_AMD_GPU
)
if
(
WITH_AMD_GPU
)
find_package
(
HIP
)
find_package
(
HIP
)
include
(
hip
)
include
(
hip
)
endif
(
WITH_AMD_GPU
)
endif
(
WITH_AMD_GPU
)
if
(
WITH_MKLML
)
list
(
APPEND EXTERNAL_LIBS
${
MKLML_IOMP_LIB
}
)
endif
()
if
(
WITH_LIBXSMM
)
list
(
APPEND EXTERNAL_LIBS
${
LIBXSMM_LIBS
}
)
endif
()
if
(
WITH_MKLDNN
)
list
(
APPEND EXTERNAL_LIBS
${
MKLDNN_LIB
}
)
endif
()
set
(
PADDLE_PYTHON_BUILD_DIR
"
${
CMAKE_CURRENT_BINARY_DIR
}
/python/build"
)
set
(
PADDLE_PYTHON_BUILD_DIR
"
${
CMAKE_CURRENT_BINARY_DIR
}
/python/build"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O3 -g -DNDEBUG"
)
set
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"-O3 -g -DNDEBUG"
)
...
...
cmake/configure.cmake
浏览文件 @
b28afef7
...
@@ -20,31 +20,10 @@ if(WITH_DSO)
...
@@ -20,31 +20,10 @@ if(WITH_DSO)
add_definitions
(
-DPADDLE_USE_DSO
)
add_definitions
(
-DPADDLE_USE_DSO
)
endif
(
WITH_DSO
)
endif
(
WITH_DSO
)
if
(
WITH_DOUBLE
)
add_definitions
(
-DPADDLE_TYPE_DOUBLE
)
endif
(
WITH_DOUBLE
)
if
(
WITH_ARM_FP16
)
add_definitions
(
-DPADDLE_ARM_FP16
)
add_definitions
(
"-march=armv8.2-a+fp16+simd"
)
endif
(
WITH_ARM_FP16
)
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
add_definitions
(
-DPADDLE_WITH_TESTING
)
add_definitions
(
-DPADDLE_WITH_TESTING
)
endif
(
WITH_TESTING
)
endif
(
WITH_TESTING
)
if
(
NOT WITH_TIMER
)
add_definitions
(
-DPADDLE_DISABLE_TIMER
)
endif
(
NOT WITH_TIMER
)
if
(
USE_EIGEN_FOR_BLAS
)
add_definitions
(
-DPADDLE_USE_EIGEN_FOR_BLAS
)
endif
(
USE_EIGEN_FOR_BLAS
)
if
(
EIGEN_USE_THREADS
)
add_definitions
(
-DEIGEN_USE_THREADS
)
endif
(
EIGEN_USE_THREADS
)
if
(
NOT WITH_PROFILER
)
if
(
NOT WITH_PROFILER
)
add_definitions
(
-DPADDLE_DISABLE_PROFILER
)
add_definitions
(
-DPADDLE_DISABLE_PROFILER
)
endif
(
NOT WITH_PROFILER
)
endif
(
NOT WITH_PROFILER
)
...
@@ -78,10 +57,6 @@ if(WIN32)
...
@@ -78,10 +57,6 @@ if(WIN32)
endif
(
NOT MSVC
)
endif
(
NOT MSVC
)
endif
(
WIN32
)
endif
(
WIN32
)
if
(
NOT WITH_GOLANG
)
add_definitions
(
-DPADDLE_WITHOUT_GOLANG
)
endif
(
NOT WITH_GOLANG
)
if
(
WITH_PSLIB
)
if
(
WITH_PSLIB
)
add_definitions
(
-DPADDLE_WITH_PSLIB
)
add_definitions
(
-DPADDLE_WITH_PSLIB
)
endif
()
endif
()
...
@@ -171,55 +146,6 @@ if(WITH_DISTRIBUTE)
...
@@ -171,55 +146,6 @@ if(WITH_DISTRIBUTE)
add_definitions
(
-DPADDLE_WITH_DISTRIBUTE
)
add_definitions
(
-DPADDLE_WITH_DISTRIBUTE
)
endif
()
endif
()
if
(
WITH_GOLANG
)
# we need to symlink Paddle directory into GOPATH. If we
# don't do it and we have code that depends on Paddle, go
# get ./... will download a new Paddle repo from Github,
# without the changes in our current Paddle repo that we
# want to build.
set
(
GOPATH
"
${
CMAKE_CURRENT_BINARY_DIR
}
/go"
)
file
(
MAKE_DIRECTORY
${
GOPATH
}
)
set
(
PADDLE_IN_GOPATH
"
${
GOPATH
}
/src/github.com/PaddlePaddle/Paddle"
)
file
(
MAKE_DIRECTORY
"
${
PADDLE_IN_GOPATH
}
"
)
set
(
PADDLE_GO_PATH
"
${
CMAKE_SOURCE_DIR
}
/go"
)
add_custom_target
(
go_path
)
add_custom_command
(
TARGET go_path
# Symlink Paddle directory into GOPATH
COMMAND mkdir -p
${
PADDLE_IN_GOPATH
}
COMMAND rm -rf
${
PADDLE_IN_GOPATH
}
COMMAND ln -sf
${
CMAKE_SOURCE_DIR
}
${
PADDLE_IN_GOPATH
}
# Automatically get all dependencies specified in the source code
# We can't run `go get -d ./...` for every target, because
# multiple `go get` can not run concurrently, but make need to be
# able to run with multiple jobs.
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
)
if
(
GLIDE_INSTALL
)
if
(
EXISTS $ENV{GOPATH}/bin/glide
)
set
(
GLIDE
"$ENV{GOPATH}/bin/glide"
)
else
()
message
(
FATAL_ERROR
"no glide executeble found: $ENV{GOPATH}/bin/glide"
)
endif
()
# this command will only run when the file it depends is missing
# or has changed, or the output is missing.
add_custom_command
(
OUTPUT
${
CMAKE_BINARY_DIR
}
/glide
COMMAND env GOPATH=
${
GOPATH
}
${
GLIDE
}
install
COMMAND touch
${
CMAKE_BINARY_DIR
}
/glide
DEPENDS
${
PADDLE_SOURCE_DIR
}
/go/glide.lock
WORKING_DIRECTORY
"
${
PADDLE_IN_GOPATH
}
/go"
)
# depends on the custom command which outputs
# ${CMAKE_BINARY_DIR}/glide, the custom command does not need to
# run every time this target is built.
add_custom_target
(
go_vendor DEPENDS
${
CMAKE_BINARY_DIR
}
/glide go_path
)
endif
()
endif
(
WITH_GOLANG
)
if
(
WITH_GRPC
)
if
(
WITH_GRPC
)
add_definitions
(
-DPADDLE_WITH_GRPC
)
add_definitions
(
-DPADDLE_WITH_GRPC
)
endif
(
WITH_GRPC
)
endif
(
WITH_GRPC
)
...
...
cmake/cuda.cmake
浏览文件 @
b28afef7
...
@@ -168,10 +168,7 @@ elseif (${CUDA_VERSION} LESS 11.0) # CUDA 10.x
...
@@ -168,10 +168,7 @@ elseif (${CUDA_VERSION} LESS 11.0) # CUDA 10.x
endif
()
endif
()
include_directories
(
${
CUDA_INCLUDE_DIRS
}
)
include_directories
(
${
CUDA_INCLUDE_DIRS
}
)
list
(
APPEND EXTERNAL_LIBS
${
CUDA_LIBRARIES
}
${
CUDA_rt_LIBRARY
}
)
if
(
NOT WITH_DSO
)
if
(
NOT WITH_DSO
)
# TODO(panyx0718): CUPTI only allows DSO?
list
(
APPEND EXTERNAL_LIBS
${
CUDNN_LIBRARY
}
${
CUPTI_LIBRARY
}
${
CUDA_CUBLAS_LIBRARIES
}
${
CUDA_curand_LIBRARY
}
${
NCCL_LIBRARY
}
)
if
(
WIN32
)
if
(
WIN32
)
set_property
(
GLOBAL PROPERTY CUDA_MODULES
${
CUDNN_LIBRARY
}
${
CUDA_CUBLAS_LIBRARIES
}
${
CUDA_curand_LIBRARY
}
)
set_property
(
GLOBAL PROPERTY CUDA_MODULES
${
CUDNN_LIBRARY
}
${
CUDA_CUBLAS_LIBRARIES
}
${
CUDA_curand_LIBRARY
}
)
endif
(
WIN32
)
endif
(
WIN32
)
...
...
cmake/external/openblas.cmake
浏览文件 @
b28afef7
...
@@ -11,11 +11,6 @@
...
@@ -11,11 +11,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# See the License for the specific language governing permissions and
# limitations under the License.
# limitations under the License.
IF
(
USE_EIGEN_FOR_BLAS
)
return
()
ENDIF
(
USE_EIGEN_FOR_BLAS
)
INCLUDE
(
cblas
)
INCLUDE
(
cblas
)
IF
(
NOT
${
CBLAS_FOUND
}
)
IF
(
NOT
${
CBLAS_FOUND
}
)
...
...
cmake/hip.cmake
浏览文件 @
b28afef7
...
@@ -11,8 +11,6 @@ include_directories("/opt/rocm/rocrand/include")
...
@@ -11,8 +11,6 @@ include_directories("/opt/rocm/rocrand/include")
include_directories
(
"/opt/rocm/rccl/include"
)
include_directories
(
"/opt/rocm/rccl/include"
)
include_directories
(
"/opt/rocm/thrust"
)
include_directories
(
"/opt/rocm/thrust"
)
list
(
APPEND EXTERNAL_LIBS
"-L/opt/rocm/lib/ -lhip_hcc"
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-fPIC -DPADDLE_WITH_HIP -std=c++11"
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-fPIC -DPADDLE_WITH_HIP -std=c++11"
)
if
(
WITH_DSO
)
if
(
WITH_DSO
)
...
@@ -31,22 +29,12 @@ if(WITH_GRPC)
...
@@ -31,22 +29,12 @@ if(WITH_GRPC)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITH_GRPC"
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITH_GRPC"
)
endif
(
WITH_GRPC
)
endif
(
WITH_GRPC
)
if
(
NOT WITH_GOLANG
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITHOUT_GOLANG"
)
endif
(
NOT WITH_GOLANG
)
if
(
WITH_MKLDNN
)
if
(
WITH_MKLDNN
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITH_MKLDNN"
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITH_MKLDNN"
)
endif
(
WITH_MKLDNN
)
endif
(
WITH_MKLDNN
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DANY_IMPL_ANY_CAST_MOVEABLE"
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DANY_IMPL_ANY_CAST_MOVEABLE"
)
if
(
NOT WITH_RDMA
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_DISABLE_RDMA"
)
endif
(
NOT WITH_RDMA
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
list
(
APPEND HIP_HCC_FLAGS
${
CMAKE_CXX_FLAGS_DEBUG
}
)
list
(
APPEND HIP_HCC_FLAGS
${
CMAKE_CXX_FLAGS_DEBUG
}
)
elseif
(
CMAKE_BUILD_TYPE STREQUAL
"RelWithDebInfo"
)
elseif
(
CMAKE_BUILD_TYPE STREQUAL
"RelWithDebInfo"
)
...
...
cmake/rdma.cmake
已删除
100644 → 0
浏览文件 @
a0666b05
# user should download rdma first from subversion repository
# execute following instruction to download svn mannally
# svn co https://svn.baidu.com/sys/ip/trunk/rdma/sockrdmav1 rdma/
# svn co https://svn.baidu.com/sys/ip/trunk/rdma/thirdparty rdma/
# we use static output in svn repositories to avoid implict bugs from not standard runtime env.
if
(
WITH_RDMA
)
set
(
RDMA_ROOT $ENV{RDMA_ROOT} CACHE PATH
"Folder contains RDMA sock library and thirdparty library"
)
function
(
generate_rdma_links
)
#redirect to current DIR to isolate the pollution from system runtime environment
#it can benifits unified control for different gcc environment.
#e.g, by default gcc48 did not refer /usr/lib64 which could contain low version
#runtime libraries that will crash process while loading it. That redirect trick
#can fix it.
execute_process
(
COMMAND mkdir -p librdma
COMMAND ln -s -f /usr/lib64/libibverbs.so.1.0.0 librdma/libibverbs.so.1
COMMAND ln -s -f /usr/lib64/libibverbs.so.1.0.0 librdma/libibverbs.so
COMMAND ln -s -f /usr/lib64/librdmacm.so.1.0.0 librdma/librdmacm.so.1
COMMAND ln -s -f /usr/lib64/librdmacm.so.1.0.0 librdma/librdmacm.so
COMMAND ln -s -f /lib64/libnl.so.1.1.4 librdma/libnl.so.1
COMMAND ln -s -f /lib64/libnl.so.1.1.4 librdma/libnl.so
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
endfunction
(
generate_rdma_links
)
#check and set headers
find_path
(
RDMA_INC_SXISOCK sxi_sock.h PATHS
${
RDMA_ROOT
}
/sockrdmav1/output/include
)
find_path
(
RDMA_INC_XIO libxio.h PATHS
${
RDMA_ROOT
}
/thirdparty/output/accelio
)
find_path
(
RDMA_INC_EVENT event2 PATHS
${
RDMA_ROOT
}
/thirdparty/output/libevent
)
find_path
(
RDMA_INC_NUMA numa.h PATHS
${
RDMA_ROOT
}
/thirdparty/output/libnuma
)
#check and set libs
find_library
(
RDMA_LIB_SXISOCK NAMES sxisock PATHS
${
RDMA_ROOT
}
/sockrdmav1/output
)
find_library
(
RDMA_LIB_XIO NAMES xio PATHS
${
RDMA_ROOT
}
/thirdparty/output/accelio
)
find_library
(
RDMA_LIB_EVENT NAMES event PATHS
${
RDMA_ROOT
}
/thirdparty/output/libevent
)
find_library
(
RDMA_LIB_EVENT_CORE NAMES event_core PATHS
${
RDMA_ROOT
}
/thirdparty/output/libevent
)
find_library
(
RDMA_LIB_EVENT_EXTRA NAMES event_extra PATHS
${
RDMA_ROOT
}
/thirdparty/output/libevent
)
find_library
(
RDMA_LIB_EVENT_PTHREADS NAMES event_pthreads PATHS
${
RDMA_ROOT
}
/thirdparty/output/libevent
)
find_library
(
RDMA_LIB_NUMA NAMES numa PATHS
${
RDMA_ROOT
}
/thirdparty/output/libnuma
)
if
(
RDMA_INC_SXISOCK AND
RDMA_INC_XIO AND
RDMA_INC_EVENT AND
RDMA_INC_NUMA AND
RDMA_LIB_SXISOCK AND
RDMA_LIB_XIO AND
RDMA_LIB_EVENT AND
RDMA_LIB_EVENT_CORE AND
RDMA_LIB_EVENT_EXTRA AND
RDMA_LIB_EVENT_PTHREADS AND
RDMA_LIB_NUMA
)
set
(
RDMA_INC_DIR
${
RDMA_INC_SXISOCK
}
${
RDMA_INC_XIO
}
${
RDMA_INC_EVENT
}
${
RDMA_INC_NUMA
}
)
set
(
RDMA_LIBS
${
RDMA_LIB_SXISOCK
}
${
RDMA_LIB_XIO
}
${
RDMA_LIB_EVENT
}
${
RDMA_LIB_EVENT_CORE
}
${
RDMA_LIB_EVENT_EXTRA
}
${
RDMA_LIB_EVENT_PTHREADS
}
${
RDMA_LIB_NUMA
}
)
set
(
RDMA_LD_FLAGS
"-L./librdma -libverbs -lrdmacm -Xlinker -rpath ./librdma"
)
include_directories
(
"
${
RDMA_INC_DIR
}
"
)
else
()
#if this module is not called, RDMA_INC_DIR RDMA_LIBS will be null, so top module always refer this variable
message
(
FATAL_ERROR,
"RDMA libraries are not found, try to set RDMA_ROOT or check all related libraries."
)
endif
()
else
(
WITH_RDMA
)
set
(
RDMA_LIBS
""
)
set
(
RDMA_LD_FLAGS
""
)
add_definitions
(
-DPADDLE_DISABLE_RDMA
)
endif
(
WITH_RDMA
)
cmake/tensorrt.cmake
浏览文件 @
b28afef7
...
@@ -33,6 +33,5 @@ if(TENSORRT_FOUND)
...
@@ -33,6 +33,5 @@ if(TENSORRT_FOUND)
message
(
STATUS
"Current TensorRT header is
${
TENSORRT_INCLUDE_DIR
}
/NvInfer.h. "
message
(
STATUS
"Current TensorRT header is
${
TENSORRT_INCLUDE_DIR
}
/NvInfer.h. "
"Current TensorRT version is v
${
TENSORRT_MAJOR_VERSION
}
. "
)
"Current TensorRT version is v
${
TENSORRT_MAJOR_VERSION
}
. "
)
include_directories
(
${
TENSORRT_INCLUDE_DIR
}
)
include_directories
(
${
TENSORRT_INCLUDE_DIR
}
)
list
(
APPEND EXTERNAL_LIBS
${
TENSORRT_LIBRARY
}
)
add_definitions
(
-DPADDLE_WITH_TENSORRT
)
add_definitions
(
-DPADDLE_WITH_TENSORRT
)
endif
()
endif
()
paddle/contrib/float16/run_float16_demo.sh
浏览文件 @
b28afef7
...
@@ -14,9 +14,7 @@ cmake .. -DWITH_AVX=OFF \
...
@@ -14,9 +14,7 @@ cmake .. -DWITH_AVX=OFF \
-DWITH_MKL
=
OFF
\
-DWITH_MKL
=
OFF
\
-DWITH_GPU
=
ON
\
-DWITH_GPU
=
ON
\
-DWITH_TESTING
=
ON
\
-DWITH_TESTING
=
ON
\
-DWITH_TIMER
=
ON
\
-DWITH_PROFILER
=
ON
\
-DWITH_PROFILER
=
ON
\
-DWITH_FLUID_ONLY
=
ON
make
-j
`
nproc
`
make
-j
`
nproc
`
pip
install
-U
"
$WHEEL_PATH
/
$(
ls
$WHEEL_PATH
)
"
pip
install
-U
"
$WHEEL_PATH
/
$(
ls
$WHEEL_PATH
)
"
...
...
paddle/fluid/train/demo/README.md
浏览文件 @
b28afef7
...
@@ -9,7 +9,6 @@
...
@@ -9,7 +9,6 @@
PADDLE_LIB=/paddle/lib/dir
PADDLE_LIB=/paddle/lib/dir
cmake .. -DFLUID_INSTALL_DIR=$PADDLE_LIB \
cmake .. -DFLUID_INSTALL_DIR=$PADDLE_LIB \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_FLUID_ONLY=ON \
-DWITH_GPU=OFF \
-DWITH_GPU=OFF \
-DWITH_STYLE_CHECK=OFF \
-DWITH_STYLE_CHECK=OFF \
-DWITH_MKL=OFF \
-DWITH_MKL=OFF \
...
...
paddle/scripts/README.md
浏览文件 @
b28afef7
...
@@ -66,12 +66,10 @@ Users can specify the following Docker build arguments with either "ON" or "OFF"
...
@@ -66,12 +66,10 @@ Users can specify the following Docker build arguments with either "ON" or "OFF"
|
`WITH_AVX`
| OFF | Set to "ON" to enable AVX support. |
|
`WITH_AVX`
| OFF | Set to "ON" to enable AVX support. |
|
`WITH_TESTING`
| OFF | Build unit tests binaries. |
|
`WITH_TESTING`
| OFF | Build unit tests binaries. |
|
`WITH_MKL`
| ON | Build with
[
Intel® MKL
](
https://software.intel.com/en-us/mkl
)
and
[
Intel® MKL-DNN
](
https://github.com/01org/mkl-dnn
)
support. |
|
`WITH_MKL`
| ON | Build with
[
Intel® MKL
](
https://software.intel.com/en-us/mkl
)
and
[
Intel® MKL-DNN
](
https://github.com/01org/mkl-dnn
)
support. |
|
`WITH_GOLANG`
| OFF | Build fault-tolerant parameter server written in go. |
|
`WITH_PYTHON`
| ON | Build with python support. Turn this off if build is only for capi. |
|
`WITH_PYTHON`
| ON | Build with python support. Turn this off if build is only for capi. |
|
`WITH_STYLE_CHECK`
| ON | Check the code style when building. |
|
`WITH_STYLE_CHECK`
| ON | Check the code style when building. |
|
`PYTHON_ABI`
| "" | Build for different python ABI support, can be cp27-cp27m or cp27-cp27mu |
|
`PYTHON_ABI`
| "" | Build for different python ABI support, can be cp27-cp27m or cp27-cp27mu |
|
`RUN_TEST`
| OFF | Run unit test immediently after the build. |
|
`RUN_TEST`
| OFF | Run unit test immediently after the build. |
|
`WITH_DOC`
| OFF | Build docs after build binaries. |
|
`WOBOQ`
| OFF | Generate WOBOQ code viewer under
`build/woboq_out`
|
|
`WOBOQ`
| OFF | Generate WOBOQ code viewer under
`build/woboq_out`
|
## Docker Images
## Docker Images
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
b28afef7
...
@@ -87,7 +87,6 @@ function cmake_gen() {
...
@@ -87,7 +87,6 @@ function cmake_gen() {
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.5/bin/python3
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.5/bin/python3
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m/
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m/
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.5/lib/libpython3.5m.dylib"
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.5/lib/libpython3.5m.dylib"
WITH_FLUID_ONLY
=
${
WITH_FLUID_ONLY
:-
ON
}
pip3.5 uninstall
-y
protobuf
pip3.5 uninstall
-y
protobuf
pip3.5
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
pip3.5
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
else
else
...
@@ -101,7 +100,6 @@ function cmake_gen() {
...
@@ -101,7 +100,6 @@ function cmake_gen() {
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/bin/python3
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/bin/python3
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m/
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m/
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6m.dylib"
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.6/lib/libpython3.6m.dylib"
WITH_FLUID_ONLY
=
${
WITH_FLUID_ONLY
:-
ON
}
pip3.6 uninstall
-y
protobuf
pip3.6 uninstall
-y
protobuf
pip3.6
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
pip3.6
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
else
else
...
@@ -115,7 +113,6 @@ function cmake_gen() {
...
@@ -115,7 +113,6 @@ function cmake_gen() {
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.7/bin/python3
PYTHON_FLAGS
=
"-DPYTHON_EXECUTABLE:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.7/bin/python3
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.7/include/python3.7m/
-DPYTHON_INCLUDE_DIR:PATH=/Library/Frameworks/Python.framework/Versions/3.7/include/python3.7m/
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib"
-DPYTHON_LIBRARY:FILEPATH=/Library/Frameworks/Python.framework/Versions/3.7/lib/libpython3.7m.dylib"
WITH_FLUID_ONLY
=
${
WITH_FLUID_ONLY
:-
ON
}
pip3.7 uninstall
-y
protobuf
pip3.7 uninstall
-y
protobuf
pip3.7
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
pip3.7
install
--user
-r
${
PADDLE_ROOT
}
/python/requirements.txt
else
else
...
@@ -202,7 +199,6 @@ function cmake_gen() {
...
@@ -202,7 +199,6 @@ function cmake_gen() {
-DWITH_TESTING=
${
WITH_TESTING
:-
ON
}
-DWITH_TESTING=
${
WITH_TESTING
:-
ON
}
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
-DCMAKE_MODULE_PATH=/opt/rocm/hip/cmake
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DWITH_FLUID_ONLY=
${
WITH_FLUID_ONLY
:-
OFF
}
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-DWITH_CONTRIB=
${
WITH_CONTRIB
:-
ON
}
-DWITH_CONTRIB=
${
WITH_CONTRIB
:-
ON
}
-DWITH_INFERENCE_API_TEST=
${
WITH_INFERENCE_API_TEST
:-
ON
}
-DWITH_INFERENCE_API_TEST=
${
WITH_INFERENCE_API_TEST
:-
ON
}
...
@@ -235,7 +231,6 @@ EOF
...
@@ -235,7 +231,6 @@ EOF
-DCUDNN_ROOT
=
/usr/
\
-DCUDNN_ROOT
=
/usr/
\
-DWITH_TESTING
=
${
WITH_TESTING
:-
ON
}
\
-DWITH_TESTING
=
${
WITH_TESTING
:-
ON
}
\
-DCMAKE_MODULE_PATH
=
/opt/rocm/hip/cmake
\
-DCMAKE_MODULE_PATH
=
/opt/rocm/hip/cmake
\
-DWITH_FLUID_ONLY
=
${
WITH_FLUID_ONLY
:-
OFF
}
\
-DCMAKE_EXPORT_COMPILE_COMMANDS
=
ON
\
-DCMAKE_EXPORT_COMPILE_COMMANDS
=
ON
\
-DWITH_CONTRIB
=
${
WITH_CONTRIB
:-
ON
}
\
-DWITH_CONTRIB
=
${
WITH_CONTRIB
:-
ON
}
\
-DWITH_INFERENCE_API_TEST
=
${
WITH_INFERENCE_API_TEST
:-
ON
}
\
-DWITH_INFERENCE_API_TEST
=
${
WITH_INFERENCE_API_TEST
:-
ON
}
\
...
@@ -398,9 +393,7 @@ EOF
...
@@ -398,9 +393,7 @@ EOF
pip3.7
install
--user
${
INSTALL_PREFIX
:-
/paddle/build
}
/opt/paddle/share/wheels/
*
.whl
pip3.7
install
--user
${
INSTALL_PREFIX
:-
/paddle/build
}
/opt/paddle/share/wheels/
*
.whl
fi
fi
if
[[
${
WITH_FLUID_ONLY
:-
OFF
}
==
"OFF"
]]
;
then
paddle version
paddle version
fi
if
[
"
$1
"
==
"cp27-cp27m"
]
;
then
if
[
"
$1
"
==
"cp27-cp27m"
]
;
then
pip uninstall
-y
paddlepaddle
pip uninstall
-y
paddlepaddle
...
@@ -555,7 +548,6 @@ EOF
...
@@ -555,7 +548,6 @@ EOF
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DWITH_GPU
=
OFF
\
-DWITH_GPU
=
OFF
\
-DWITH_MKL
=
OFF
\
-DWITH_MKL
=
OFF
\
-DWITH_FLUID_ONLY
=
ON
local
LIB_TYPE
=
$1
local
LIB_TYPE
=
$1
case
$LIB_TYPE
in
case
$LIB_TYPE
in
...
@@ -631,13 +623,8 @@ EOF
...
@@ -631,13 +623,8 @@ EOF
NCCL_DEPS
=
"true"
NCCL_DEPS
=
"true"
fi
fi
if
[[
${
WITH_FLUID_ONLY
:-
OFF
}
==
"OFF"
]]
;
then
PADDLE_VERSION
=
"paddle version"
PADDLE_VERSION
=
"paddle version"
CMD
=
'"paddle", "version"'
CMD
=
'"paddle", "version"'
else
PADDLE_VERSION
=
"true"
CMD
=
'"true"'
fi
if
[
"
$1
"
==
"cp35-cp35m"
]
;
then
if
[
"
$1
"
==
"cp35-cp35m"
]
;
then
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
...
@@ -722,12 +709,6 @@ EOF
...
@@ -722,12 +709,6 @@ EOF
EOF
EOF
fi
fi
if
[[
${
WITH_GOLANG
:-
OFF
}
==
"ON"
]]
;
then
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
ADD go/cmd/pserver/pserver /usr/bin/
ADD go/cmd/master/master /usr/bin/
EOF
fi
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
cat
>>
${
PADDLE_ROOT
}
/build/Dockerfile
<<
EOF
# default command shows the paddle version and exit
# default command shows the paddle version and exit
CMD [
${
CMD
}
]
CMD [
${
CMD
}
]
...
...
paddle/scripts/paddle_docker_build.sh
浏览文件 @
b28afef7
...
@@ -26,7 +26,6 @@ function start_build_docker() {
...
@@ -26,7 +26,6 @@ function start_build_docker() {
-e WITH_GPU=ON
\
-e WITH_GPU=ON
\
-e CUDA_ARCH_NAME=Auto
\
-e CUDA_ARCH_NAME=Auto
\
-e WITH_AVX=ON
\
-e WITH_AVX=ON
\
-e WITH_GOLANG=OFF
\
-e WITH_TESTING=ON
\
-e WITH_TESTING=ON
\
-e WITH_COVERAGE=ON
\
-e WITH_COVERAGE=ON
\
-e COVERALLS_UPLOAD=ON
\
-e COVERALLS_UPLOAD=ON
\
...
@@ -35,7 +34,6 @@ function start_build_docker() {
...
@@ -35,7 +34,6 @@ function start_build_docker() {
-e PADDLE_FRACTION_GPU_MEMORY_TO_USE=0.15
\
-e PADDLE_FRACTION_GPU_MEMORY_TO_USE=0.15
\
-e CUDA_VISIBLE_DEVICES=0,1
\
-e CUDA_VISIBLE_DEVICES=0,1
\
-e WITH_DISTRIBUTE=ON
\
-e WITH_DISTRIBUTE=ON
\
-e WITH_FLUID_ONLY=ON
\
-e RUN_TEST=ON
-e RUN_TEST=ON
EOL
EOL
)
)
...
...
paddle/scripts/submit_local.sh.in
浏览文件 @
b28afef7
...
@@ -6,10 +6,7 @@ function version(){
...
@@ -6,10 +6,7 @@ function version(){
echo
" with_gpu: @WITH_GPU@"
echo
" with_gpu: @WITH_GPU@"
echo
" with_mkl: @WITH_MKL@"
echo
" with_mkl: @WITH_MKL@"
echo
" with_mkldnn: @WITH_MKLDNN@"
echo
" with_mkldnn: @WITH_MKLDNN@"
echo
" with_double: @WITH_DOUBLE@"
echo
" with_python: @WITH_PYTHON@"
echo
" with_python: @WITH_PYTHON@"
echo
" with_rdma: @WITH_RDMA@"
echo
" with_timer: @WITH_TIMER@"
}
}
function
ver2num
()
{
function
ver2num
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录