Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
97859915
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
97859915
编写于
2月 19, 2019
作者:
T
Tao Luo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove legacy WITH_GOLANG, GLIDE_INSTALL options
上级
f522b441
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
0 addition
and
67 deletion
+0
-67
CMakeLists.txt
CMakeLists.txt
+0
-2
cmake/configure.cmake
cmake/configure.cmake
+0
-53
cmake/hip.cmake
cmake/hip.cmake
+0
-4
paddle/scripts/README.md
paddle/scripts/README.md
+0
-1
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+0
-6
paddle/scripts/paddle_docker_build.sh
paddle/scripts/paddle_docker_build.sh
+0
-1
未找到文件。
CMakeLists.txt
浏览文件 @
97859915
...
...
@@ -59,8 +59,6 @@ option(WITH_JEMALLOC "Compile PaddlePaddle with jemalloc" OFF)
option
(
WITH_COVERAGE
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
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_PSLIB
"Compile with pslib support"
OFF
)
option
(
EIGEN_USE_THREADS
"Compile with multi-threaded Eigen"
OFF
)
...
...
cmake/configure.cmake
浏览文件 @
97859915
...
...
@@ -66,10 +66,6 @@ if(WIN32)
endif
(
NOT MSVC
)
endif
(
WIN32
)
if
(
NOT WITH_GOLANG
)
add_definitions
(
-DPADDLE_WITHOUT_GOLANG
)
endif
(
NOT WITH_GOLANG
)
if
(
WITH_PSLIB
)
add_definitions
(
-DPADDLE_WITH_PSLIB
)
endif
()
...
...
@@ -159,55 +155,6 @@ if(WITH_DISTRIBUTE)
add_definitions
(
-DPADDLE_WITH_DISTRIBUTE
)
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
)
add_definitions
(
-DPADDLE_WITH_GRPC
)
endif
(
WITH_GRPC
)
...
...
cmake/hip.cmake
浏览文件 @
97859915
...
...
@@ -31,10 +31,6 @@ if(WITH_GRPC)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_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
)
set
(
HIP_HCC_FLAGS
"
${
HIP_HCC_FLAGS
}
-DPADDLE_WITH_MKLDNN"
)
endif
(
WITH_MKLDNN
)
...
...
paddle/scripts/README.md
浏览文件 @
97859915
...
...
@@ -66,7 +66,6 @@ Users can specify the following Docker build arguments with either "ON" or "OFF"
|
`WITH_AVX`
| OFF | Set to "ON" to enable AVX support. |
|
`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_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_STYLE_CHECK`
| ON | Check the code style when building. |
|
`PYTHON_ABI`
| "" | Build for different python ABI support, can be cp27-cp27m or cp27-cp27mu |
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
97859915
...
...
@@ -722,12 +722,6 @@ EOF
EOF
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
# default command shows the paddle version and exit
CMD [
${
CMD
}
]
...
...
paddle/scripts/paddle_docker_build.sh
浏览文件 @
97859915
...
...
@@ -26,7 +26,6 @@ function start_build_docker() {
-e WITH_GPU=ON
\
-e CUDA_ARCH_NAME=Auto
\
-e WITH_AVX=ON
\
-e WITH_GOLANG=OFF
\
-e WITH_TESTING=ON
\
-e WITH_COVERAGE=ON
\
-e COVERALLS_UPLOAD=ON
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录