Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
TonyTonyFun
Paddle
提交
561ae9d5
P
Paddle
项目概览
TonyTonyFun
/
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,发现更多精彩内容 >>
提交
561ae9d5
编写于
1月 21, 2019
作者:
T
Tao Luo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove legacy WITH_C_API option
上级
266e625d
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
3 addition
and
126 deletion
+3
-126
CMakeLists.txt
CMakeLists.txt
+0
-17
cmake/external/gflags.cmake
cmake/external/gflags.cmake
+0
-10
cmake/external/glog.cmake
cmake/external/glog.cmake
+0
-9
cmake/external/mkldnn.cmake
cmake/external/mkldnn.cmake
+0
-4
cmake/external/mklml.cmake
cmake/external/mklml.cmake
+0
-4
cmake/external/openblas.cmake
cmake/external/openblas.cmake
+0
-19
cmake/external/protobuf.cmake
cmake/external/protobuf.cmake
+0
-9
cmake/external/pslib.cmake
cmake/external/pslib.cmake
+0
-4
cmake/external/pslib_brpc.cmake
cmake/external/pslib_brpc.cmake
+0
-4
cmake/external/xxhash.cmake
cmake/external/xxhash.cmake
+0
-9
cmake/external/zlib.cmake
cmake/external/zlib.cmake
+0
-9
paddle/scripts/README.md
paddle/scripts/README.md
+0
-1
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+3
-26
paddle/scripts/paddle_docker_build.sh
paddle/scripts/paddle_docker_build.sh
+0
-1
未找到文件。
CMakeLists.txt
浏览文件 @
561ae9d5
...
...
@@ -60,7 +60,6 @@ option(WITH_DOC "Compile PaddlePaddle with documentation" OFF)
option
(
WITH_COVERAGE
"Compile PaddlePaddle with code coverage"
OFF
)
option
(
COVERALLS_UPLOAD
"Package code coverage data to coveralls"
OFF
)
option
(
ON_TRAVIS
"Exclude special unit test on Travis CI"
OFF
)
option
(
WITH_C_API
"Compile PaddlePaddle with C-API(Prediction)"
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
)
...
...
@@ -119,10 +118,6 @@ if(ANDROID OR IOS)
"Disable golang when cross-compiling for Android and iOS"
FORCE
)
# Compile PaddlePaddle mobile inference library
if
(
NOT WITH_C_API
)
set
(
WITH_C_API ON CACHE STRING
"Always compile the C_API when cross-compiling for Android and iOS"
FORCE
)
endif
()
set
(
MOBILE_INFERENCE ON
)
add_definitions
(
-DPADDLE_MOBILE_INFERENCE
)
endif
()
...
...
@@ -135,8 +130,6 @@ endif()
if
(
WIN32
)
set
(
WITH_DISTRIBUTE OFF CACHE STRING
"Disable DISTRIBUTE when compiling for Windows"
FORCE
)
set
(
WITH_C_API OFF CACHE STRING
"Disable C_API when compiling for Windows"
FORCE
)
set
(
WITH_FLUID_ONLY ON CACHE STRING
"Enable FLUID_ONLY when compiling for Windows"
FORCE
)
endif
()
...
...
@@ -150,16 +143,6 @@ set(FLUID_INSTALL_DIR "${CMAKE_BINARY_DIR}/fluid_install_dir" CACHE STRING
set
(
FLUID_INFERENCE_INSTALL_DIR
"
${
CMAKE_BINARY_DIR
}
/fluid_inference_install_dir"
CACHE STRING
"A path setting fluid inference shared and static libraries"
)
if
(
WITH_C_API AND WITH_PYTHON
)
message
(
WARNING
"It is suggest not embedded a python interpreter in Paddle "
"when using C-API. It will give an unpredictable behavior when using a "
"different Python interpreter from compiling."
)
endif
()
if
(
WITH_C_API
)
set
(
WITH_FLUID_ONLY OFF CACHE STRING
"Disable install fluid when compile the C_API"
FORCE
)
endif
()
if
(
MOBILE_INFERENCE
)
set
(
THIRD_PARTY_BUILD_TYPE MinSizeRel
)
else
()
...
...
cmake/external/gflags.cmake
浏览文件 @
561ae9d5
...
...
@@ -71,13 +71,3 @@ if (WIN32)
set_property
(
GLOBAL PROPERTY OS_DEPENDENCY_MODULES shlwapi.lib
)
endif
(
HAVE_SHLWAPI
)
endif
(
WIN32
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
GFLAGS_INCLUDE_DIR
}
DESTINATION third_party/gflags
)
IF
(
ANDROID
)
INSTALL
(
FILES
${
GFLAGS_LIBRARIES
}
DESTINATION third_party/gflags/lib/
${
ANDROID_ABI
}
)
ELSE
()
INSTALL
(
FILES
${
GFLAGS_LIBRARIES
}
DESTINATION third_party/gflags/lib
)
ENDIF
()
ENDIF
()
cmake/external/glog.cmake
浏览文件 @
561ae9d5
...
...
@@ -78,12 +78,3 @@ ADD_DEPENDENCIES(glog extern_glog gflags)
LINK_LIBRARIES
(
glog gflags
)
LIST
(
APPEND external_project_dependencies glog
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
GLOG_INCLUDE_DIR
}
DESTINATION third_party/glog
)
IF
(
ANDROID
)
INSTALL
(
FILES
${
GLOG_LIBRARIES
}
DESTINATION third_party/glog/lib/
${
ANDROID_ABI
}
)
ELSE
()
INSTALL
(
FILES
${
GLOG_LIBRARIES
}
DESTINATION third_party/glog/lib
)
ENDIF
()
ENDIF
()
cmake/external/mkldnn.cmake
浏览文件 @
561ae9d5
...
...
@@ -110,7 +110,3 @@ else(WIN32)
endif
(
WIN32
)
ADD_CUSTOM_TARGET
(
mkldnn_shared_lib ALL DEPENDS
${
MKLDNN_SHARED_LIB
}
)
ADD_DEPENDENCIES
(
mkldnn_shared_lib
${
MKLDNN_PROJECT
}
mkldnn
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
MKLDNN_SHARED_LIB
}
DESTINATION lib
)
ENDIF
()
cmake/external/mklml.cmake
浏览文件 @
561ae9d5
...
...
@@ -74,7 +74,3 @@ ADD_LIBRARY(mklml SHARED IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET mklml PROPERTY IMPORTED_LOCATION
${
MKLML_LIB
}
)
ADD_DEPENDENCIES
(
mklml
${
MKLML_PROJECT
}
)
LIST
(
APPEND external_project_dependencies mklml
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
MKLML_LIB
}
${
MKLML_IOMP_LIB
}
DESTINATION lib
)
ENDIF
()
cmake/external/openblas.cmake
浏览文件 @
561ae9d5
...
...
@@ -92,25 +92,6 @@ IF(NOT ${CBLAS_FOUND})
ELSE
()
ENDIF
(
NOT WIN32
)
SET
(
CBLAS_PROVIDER openblas
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
CBLAS_INC_DIR
}
DESTINATION third_party/openblas
)
# Because libopenblas.a is a symbolic link of another library, thus need to
# install the whole directory.
IF
(
ANDROID
)
SET
(
TMP_INSTALL_DIR third_party/openblas/lib/
${
ANDROID_ABI
}
)
ELSE
()
SET
(
TMP_INSTALL_DIR third_party/openblas/lib
)
ENDIF
()
INSTALL
(
CODE
"execute_process(
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
CBLAS_INSTALL_DIR
}
/lib
${
CMAKE_INSTALL_PREFIX
}
/
${
TMP_INSTALL_DIR
}
)"
)
INSTALL
(
CODE
"MESSAGE(STATUS
\"
Installing:
\"
\"
${
CBLAS_INSTALL_DIR
}
/lib ->
${
CMAKE_INSTALL_PREFIX
}
/
${
TMP_INSTALL_DIR
}
\"
)"
)
ENDIF
()
ENDIF
(
NOT
${
CBLAS_FOUND
}
)
MESSAGE
(
STATUS
"BLAS library:
${
CBLAS_LIBRARIES
}
"
)
...
...
cmake/external/protobuf.cmake
浏览文件 @
561ae9d5
...
...
@@ -266,15 +266,6 @@ IF(NOT PROTOBUF_FOUND)
SET
(
PROTOBUF_PROTOC_LIBRARY
${
extern_protobuf_PROTOC_LIBRARY
}
CACHE FILEPATH
"protoc library."
FORCE
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
PROTOBUF_INCLUDE_DIR
}
DESTINATION third_party/protobuf
)
IF
(
ANDROID
)
INSTALL
(
FILES
${
PROTOBUF_LITE_LIBRARY
}
DESTINATION third_party/protobuf/lib/
${
ANDROID_ABI
}
)
ELSE
()
INSTALL
(
FILES
${
PROTOBUF_LITE_LIBRARY
}
DESTINATION third_party/protobuf/lib
)
ENDIF
()
ENDIF
()
IF
(
CMAKE_CROSSCOMPILING
)
PROMPT_PROTOBUF_LIB
(
protobuf_host extern_protobuf
)
ELSE
()
...
...
cmake/external/pslib.cmake
浏览文件 @
561ae9d5
...
...
@@ -71,7 +71,3 @@ ADD_LIBRARY(pslib SHARED IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET pslib PROPERTY IMPORTED_LOCATION
${
PSLIB_LIB
}
)
ADD_DEPENDENCIES
(
pslib
${
PSLIB_PROJECT
}
)
LIST
(
APPEND external_project_dependencies pslib
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
PSLIB_LIB
}
${
PSLIB_IOMP_LIB
}
DESTINATION lib
)
ENDIF
()
cmake/external/pslib_brpc.cmake
浏览文件 @
561ae9d5
...
...
@@ -71,7 +71,3 @@ ADD_LIBRARY(pslib_brpc SHARED IMPORTED GLOBAL)
SET_PROPERTY
(
TARGET pslib_brpc PROPERTY IMPORTED_LOCATION
${
PSLIB_BRPC_LIB
}
)
ADD_DEPENDENCIES
(
pslib_brpc
${
PSLIB_BRPC_PROJECT
}
)
LIST
(
APPEND external_project_dependencies pslib_brpc
)
IF
(
WITH_C_API
)
INSTALL
(
FILES
${
PSLIB_BRPC_LIB
}
${
PSLIB_BRPC_IOMP_LIB
}
DESTINATION lib
)
ENDIF
()
cmake/external/xxhash.cmake
浏览文件 @
561ae9d5
...
...
@@ -73,12 +73,3 @@ include_directories(${XXHASH_INCLUDE_DIR})
add_dependencies
(
xxhash extern_xxhash
)
LIST
(
APPEND external_project_dependencies xxhash
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
XXHASH_INCLUDE_DIR
}
DESTINATION third_party/xxhash
)
IF
(
ANDROID
)
INSTALL
(
FILES
${
XXHASH_LIBRARIES
}
DESTINATION third_party/xxhash/lib/
${
ANDROID_ABI
}
)
ELSE
()
INSTALL
(
FILES
${
XXHASH_LIBRARIES
}
DESTINATION third_party/xxhash/lib
)
ENDIF
()
ENDIF
()
cmake/external/zlib.cmake
浏览文件 @
561ae9d5
...
...
@@ -59,12 +59,3 @@ SET_PROPERTY(TARGET zlib PROPERTY IMPORTED_LOCATION ${ZLIB_LIBRARIES})
ADD_DEPENDENCIES
(
zlib extern_zlib
)
LIST
(
APPEND external_project_dependencies zlib
)
IF
(
WITH_C_API
)
INSTALL
(
DIRECTORY
${
ZLIB_INCLUDE_DIR
}
DESTINATION third_party/zlib
)
IF
(
ANDROID
)
INSTALL
(
FILES
${
ZLIB_LIBRARIES
}
DESTINATION third_party/zlib/lib/
${
ANDROID_ABI
}
)
ELSE
()
INSTALL
(
FILES
${
ZLIB_LIBRARIES
}
DESTINATION third_party/zlib/lib
)
ENDIF
()
ENDIF
()
paddle/scripts/README.md
浏览文件 @
561ae9d5
...
...
@@ -69,7 +69,6 @@ Users can specify the following Docker build arguments with either "ON" or "OFF"
|
`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_SWIG_PY`
| ON | Build with SWIG python API support. |
|
`WITH_C_API`
| OFF | Build capi libraries for inference. |
|
`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
浏览文件 @
561ae9d5
...
...
@@ -33,7 +33,6 @@ function print_usage() {
${
BLUE
}
gen_doc_lib
${
NONE
}
: generate paddle documents library
${
BLUE
}
html
${
NONE
}
: convert C++ source code into HTML
${
BLUE
}
dockerfile
${
NONE
}
: generate paddle release dockerfile
${
BLUE
}
capi
${
NONE
}
: generate paddle CAPI package
${
BLUE
}
fluid_inference_lib
${
NONE
}
: deploy fluid inference library
${
BLUE
}
check_style
${
NONE
}
: run code style check
${
BLUE
}
cicheck
${
NONE
}
: run CI tasks
...
...
@@ -180,7 +179,6 @@ function cmake_gen() {
-DWITH_AVX=
${
WITH_AVX
:-
OFF
}
-DWITH_GOLANG=
${
WITH_GOLANG
:-
OFF
}
-DCUDA_ARCH_NAME=
${
CUDA_ARCH_NAME
:-
All
}
-DWITH_C_API=
${
WITH_C_API
:-
OFF
}
-DWITH_PYTHON=
${
WITH_PYTHON
:-
ON
}
-DWITH_SWIG_PY=
${
WITH_SWIG_PY
:-
ON
}
-DCUDNN_ROOT=/usr/
...
...
@@ -217,7 +215,6 @@ EOF
-DWITH_GOLANG
=
${
WITH_GOLANG
:-
OFF
}
\
-DCUDA_ARCH_NAME
=
${
CUDA_ARCH_NAME
:-
All
}
\
-DWITH_SWIG_PY
=
${
WITH_SWIG_PY
:-
ON
}
\
-DWITH_C_API
=
${
WITH_C_API
:-
OFF
}
\
-DWITH_PYTHON
=
${
WITH_PYTHON
:-
ON
}
\
-DCUDNN_ROOT
=
/usr/
\
-DWITH_TESTING
=
${
WITH_TESTING
:-
ON
}
\
...
...
@@ -706,21 +703,10 @@ EOF
EOF
}
function
gen_capi_package
()
{
if
[[
${
WITH_C_API
}
==
"ON"
]]
;
then
capi_install_prefix
=
${
INSTALL_PREFIX
:-
/paddle/build
}
/capi_output
rm
-rf
$capi_install_prefix
make
DESTDIR
=
"
$capi_install_prefix
"
install
cd
$capi_install_prefix
/
ls
| egrep
-v
"^Found.*item$"
| xargs
tar
-czf
${
PADDLE_ROOT
}
/build/paddle.tgz
fi
}
function
gen_fluid_lib
()
{
mkdir
-p
${
PADDLE_ROOT
}
/build
cd
${
PADDLE_ROOT
}
/build
if
[[
${
WITH_C_API
:-
OFF
}
==
"OFF"
]]
;
then
cat
<<
EOF
cat
<<
EOF
========================================
Generating fluid library for train and inference ...
========================================
...
...
@@ -732,8 +718,7 @@ EOF
}
function
tar_fluid_lib
()
{
if
[[
${
WITH_C_API
:-
OFF
}
==
"OFF"
]]
;
then
cat
<<
EOF
cat
<<
EOF
========================================
Taring fluid library for train and inference ...
========================================
...
...
@@ -747,8 +732,7 @@ EOF
}
function
test_fluid_lib
()
{
if
[[
${
WITH_C_API
:-
OFF
}
==
"OFF"
]]
;
then
cat
<<
EOF
cat
<<
EOF
========================================
Testing fluid library for inference ...
========================================
...
...
@@ -791,11 +775,6 @@ function main() {
dockerfile
)
gen_dockerfile
${
PYTHON_ABI
:-
""
}
;;
capi
)
cmake_gen
${
PYTHON_ABI
:-
""
}
build
gen_capi_package
;;
fluid_inference_lib
)
cmake_gen
${
PYTHON_ABI
:-
""
}
gen_fluid_lib
...
...
@@ -810,7 +789,6 @@ function main() {
build
assert_api_not_changed
${
PYTHON_ABI
:-
""
}
run_test
gen_capi_package
gen_fluid_lib
test_fluid_lib
assert_api_spec_approvals
...
...
@@ -820,7 +798,6 @@ function main() {
assert_api_spec_approvals
;;
test_inference
)
gen_capi_package
gen_fluid_lib
test_fluid_lib
;;
...
...
paddle/scripts/paddle_docker_build.sh
浏览文件 @
561ae9d5
...
...
@@ -28,7 +28,6 @@ function start_build_docker() {
-e WITH_AVX=ON
\
-e WITH_GOLANG=OFF
\
-e WITH_TESTING=ON
\
-e WITH_C_API=OFF
\
-e WITH_COVERAGE=ON
\
-e COVERALLS_UPLOAD=ON
\
-e WITH_DEB=OFF
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录