Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
六月暴雪飞梨花
Paddle
提交
ae174b33
P
Paddle
项目概览
六月暴雪飞梨花
/
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,发现更多精彩内容 >>
提交
ae174b33
编写于
12月 14, 2016
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove WITH_GLOG and WITH_GFLAGS in cmake
上级
3d0e73bd
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
18 addition
and
48 deletion
+18
-48
cmake/check_packages.cmake
cmake/check_packages.cmake
+2
-6
cmake/util.cmake
cmake/util.cmake
+3
-11
doc/getstarted/build_and_install/build_from_source_en.md
doc/getstarted/build_and_install/build_from_source_en.md
+1
-3
doc/getstarted/build_and_install/cmake/compile_options.csv
doc/getstarted/build_and_install/cmake/compile_options.csv
+0
-2
doc/getstarted/build_and_install/ubuntu_install_cn.rst
doc/getstarted/build_and_install/ubuntu_install_cn.rst
+0
-2
paddle/api/CMakeLists.txt
paddle/api/CMakeLists.txt
+10
-14
paddle/api/paddle_api_config.py.in
paddle/api/paddle_api_config.py.in
+0
-2
paddle/api/paddle_ld_flags.py
paddle/api/paddle_ld_flags.py
+2
-6
paddle/scripts/submit_local.sh.in
paddle/scripts/submit_local.sh.in
+0
-2
未找到文件。
cmake/check_packages.cmake
浏览文件 @
ae174b33
...
@@ -14,13 +14,9 @@ if(WITH_STYLE_CHECK)
...
@@ -14,13 +14,9 @@ if(WITH_STYLE_CHECK)
find_package
(
PythonInterp REQUIRED
)
find_package
(
PythonInterp REQUIRED
)
endif
()
endif
()
if
(
WITH_GLOG
)
find_package
(
Glog REQUIRED
)
find_package
(
Glog REQUIRED
)
endif
()
if
(
WITH_GFLAGS
)
find_package
(
Gflags REQUIRED
)
find_package
(
Gflags REQUIRED
)
endif
()
if
(
WITH_TESTING
)
if
(
WITH_TESTING
)
find_package
(
GTest REQUIRED
)
find_package
(
GTest REQUIRED
)
...
...
cmake/util.cmake
浏览文件 @
ae174b33
...
@@ -65,7 +65,7 @@ endmacro()
...
@@ -65,7 +65,7 @@ endmacro()
# link_paddle_exe
# link_paddle_exe
# add paddle library for a paddle executable, such as trainer, pserver.
# add paddle library for a paddle executable, such as trainer, pserver.
#
#
# It will handle WITH_PYTHON
/WITH_GLOG
etc.
# It will handle WITH_PYTHON etc.
function
(
link_paddle_exe TARGET_NAME
)
function
(
link_paddle_exe TARGET_NAME
)
if
(
WITH_RDMA
)
if
(
WITH_RDMA
)
generate_rdma_links
()
generate_rdma_links
()
...
@@ -108,6 +108,8 @@ function(link_paddle_exe TARGET_NAME)
...
@@ -108,6 +108,8 @@ function(link_paddle_exe TARGET_NAME)
paddle_cuda
paddle_cuda
${
METRIC_LIBS
}
${
METRIC_LIBS
}
${
PROTOBUF_LIBRARY
}
${
PROTOBUF_LIBRARY
}
${
LIBGLOG_LIBRARY
}
${
GFLAGS_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CMAKE_THREAD_LIBS_INIT
}
${
CBLAS_LIBS
}
${
CBLAS_LIBS
}
${
ZLIB_LIBRARIES
}
${
ZLIB_LIBRARIES
}
...
@@ -125,16 +127,6 @@ function(link_paddle_exe TARGET_NAME)
...
@@ -125,16 +127,6 @@ function(link_paddle_exe TARGET_NAME)
${
PYTHON_LIBRARIES
}
)
${
PYTHON_LIBRARIES
}
)
endif
()
endif
()
if
(
WITH_GLOG
)
target_link_libraries
(
${
TARGET_NAME
}
${
LIBGLOG_LIBRARY
}
)
endif
()
if
(
WITH_GFLAGS
)
target_link_libraries
(
${
TARGET_NAME
}
${
GFLAGS_LIBRARIES
}
)
endif
()
if
(
WITH_GPU
)
if
(
WITH_GPU
)
if
(
NOT WITH_DSO OR WITH_METRIC
)
if
(
NOT WITH_DSO OR WITH_METRIC
)
target_link_libraries
(
${
TARGET_NAME
}
target_link_libraries
(
${
TARGET_NAME
}
...
...
doc/getstarted/build_and_install/build_from_source_en.md
浏览文件 @
ae174b33
...
@@ -49,10 +49,8 @@ PaddlePaddle supports some build options. To enable it, first you need to instal
...
@@ -49,10 +49,8 @@ PaddlePaddle supports some build options. To enable it, first you need to instal
<tbody>
<tbody>
<tr><td
class=
"left"
>
WITH_GPU
</td><td
class=
"left"
>
Compile with GPU mode.
</td></tr>
<tr><td
class=
"left"
>
WITH_GPU
</td><td
class=
"left"
>
Compile with GPU mode.
</td></tr>
<tr><td
class=
"left"
>
WITH_DOUBLE
</td><td
class=
"left"
>
Compile with double precision floating-point, default: single precision.
</td></tr>
<tr><td
class=
"left"
>
WITH_DOUBLE
</td><td
class=
"left"
>
Compile with double precision floating-point, default: single precision.
</td></tr>
<tr><td
class=
"left"
>
WITH_GLOG
</td><td
class=
"left"
>
Compile with glog. If not found, default: an internal log implementation.
</td></tr>
<tr><td
class=
"left"
>
WITH_GFLAGS
</td><td
class=
"left"
>
Compile with gflags. If not found, default: an internal flag implementation.
</td></tr>
<tr><td
class=
"left"
>
WITH_TESTING
</td><td
class=
"left"
>
Compile with gtest for PaddlePaddle's unit testing.
</td></tr>
<tr><td
class=
"left"
>
WITH_TESTING
</td><td
class=
"left"
>
Compile with gtest for PaddlePaddle's unit testing.
</td></tr>
<tr><td
class=
"left"
>
WITH_DOC
</td><td
class=
"left"
>
Compile to generate PaddlePaddle's docs, default: disabled (OFF).
</td></tr>
<tr><td
class=
"left"
>
WITH_DOC
</td><td
class=
"left"
>
Compile to generate PaddlePaddle's docs, default: disabled (OFF).
</td></tr>
<tr><td
class=
"left"
>
WITH_SWIG_PY
</td><td
class=
"left"
>
Compile with python predict API, default: disabled (OFF).
</td></tr>
<tr><td
class=
"left"
>
WITH_SWIG_PY
</td><td
class=
"left"
>
Compile with python predict API, default: disabled (OFF).
</td></tr>
<tr><td
class=
"left"
>
WITH_STYLE_CHECK
</td><td
class=
"left"
>
Compile with code style check, default: enabled (ON).
</td></tr>
<tr><td
class=
"left"
>
WITH_STYLE_CHECK
</td><td
class=
"left"
>
Compile with code style check, default: enabled (ON).
</td></tr>
</tbody>
</tbody>
...
...
doc/getstarted/build_and_install/cmake/compile_options.csv
浏览文件 @
ae174b33
...
@@ -6,8 +6,6 @@ WITH_AVX,是否编译含有AVX指令集的PaddlePaddle二进制文件,是
...
@@ -6,8 +6,6 @@ WITH_AVX,是否编译含有AVX指令集的PaddlePaddle二进制文件,是
WITH_PYTHON,是否内嵌PYTHON解释器。方便今后的嵌入式移植工作。,是
WITH_PYTHON,是否内嵌PYTHON解释器。方便今后的嵌入式移植工作。,是
WITH_STYLE_CHECK,是否编译时进行代码风格检查,是
WITH_STYLE_CHECK,是否编译时进行代码风格检查,是
WITH_RDMA,是否开启RDMA,否
WITH_RDMA,是否开启RDMA,否
WITH_GLOG,是否开启GLOG。如果不开启,则会使用一个简化版的日志,同时方便今后的嵌入式移植工作。,取决于是否寻找到GLOG
WITH_GFLAGS,是否使用GFLAGS。如果不开启,则会使用一个简化版的命令行参数解析器,同时方便今后的嵌入式移植工作。,取决于是否寻找到GFLAGS
WITH_TIMER,是否开启计时功能。如果开启会导致运行略慢,打印的日志变多,但是方便调试和测Benchmark,否
WITH_TIMER,是否开启计时功能。如果开启会导致运行略慢,打印的日志变多,但是方便调试和测Benchmark,否
WITH_TESTING,是否开启单元测试,取决于是否寻找到GTEST
WITH_TESTING,是否开启单元测试,取决于是否寻找到GTEST
WITH_DOC,是否编译中英文文档,否
WITH_DOC,是否编译中英文文档,否
...
...
doc/getstarted/build_and_install/ubuntu_install_cn.rst
浏览文件 @
ae174b33
...
@@ -46,8 +46,6 @@ PaddlePaddle提供了ubuntu 14.04 deb安装包。
...
@@ -46,8 +46,6 @@ PaddlePaddle提供了ubuntu 14.04 deb安装包。
with_double: OFF
with_double: OFF
with_python: ON
with_python: ON
with_rdma: OFF
with_rdma: OFF
with_glog: ON
with_gflags: ON
with_metric_learning:
with_metric_learning:
with_timer: OFF
with_timer: OFF
with_predict_sdk:
with_predict_sdk:
...
...
paddle/api/CMakeLists.txt
浏览文件 @
ae174b33
...
@@ -17,22 +17,18 @@ add_library(paddle_api STATIC
...
@@ -17,22 +17,18 @@ add_library(paddle_api STATIC
${
API_SOURCES
}
)
${
API_SOURCES
}
)
add_dependencies
(
paddle_api gen_proto_cpp
)
add_dependencies
(
paddle_api gen_proto_cpp
)
list
(
LENGTH
"
${
GFLAGS_LIBRARIES
}
"
GFLAGS_LIBRARIES_LENGTH
)
if
(
WITH_GFLAGS
)
if
(
${
GFLAGS_LIBRARIES_LENGTH
}
EQUAL 0 AND TARGET
"
${
GFLAGS_LIBRARIES
}
"
)
list
(
LENGTH
"
${
GFLAGS_LIBRARIES
}
"
GFLAGS_LIBRARIES_LENGTH
)
# Because gflags compiled by cmake, so it is imported by cmake target,
# not a real library path. Get the real library path here.
if
(
${
GFLAGS_LIBRARIES_LENGTH
}
EQUAL 0 AND TARGET
"
${
GFLAGS_LIBRARIES
}
"
)
message
(
STATUS
"GFLAGS Libraries is
${
GFLAGS_LIBRARIES
}
"
)
# Because gflags compiled by cmake, so it is imported by cmake target,
get_target_property
(
GFLAGS_LOCATION
${
GFLAGS_LIBRARIES
}
LOCATION
)
# not a real library path. Get the real library path here.
message
(
STATUS
"GFLAGS Target location is
${
GFLAGS_LOCATION
}
"
)
message
(
STATUS
"GFLAGS Libraries is
${
GFLAGS_LIBRARIES
}
"
)
else
()
get_target_property
(
GFLAGS_LOCATION
${
GFLAGS_LIBRARIES
}
LOCATION
)
set
(
GFLAGS_LOCATION
${
GFLAGS_LIBRARIES
}
)
message
(
STATUS
"GFLAGS Target location is
${
GFLAGS_LOCATION
}
"
)
else
()
set
(
GFLAGS_LOCATION
${
GFLAGS_LIBRARIES
}
)
endif
()
endif
()
endif
()
configure_file
(
configure_file
(
paddle_api_config.py.in
paddle_api_config.py.in
${
PROJ_ROOT
}
/paddle/api/paddle_api_config.py
${
PROJ_ROOT
}
/paddle/api/paddle_api_config.py
...
@@ -57,7 +53,7 @@ add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/dist/.timestamp
...
@@ -57,7 +53,7 @@ add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/dist/.timestamp
paddle_trainer
paddle_trainer
paddle_api
paddle_api
paddle_cuda
paddle_cuda
${
PY_PADDLE_PYTHON_FILES
}
${
PY_PADDLE_PYTHON_FILES
}
)
)
install
(
DIRECTORY
${
PROJ_ROOT
}
/paddle/dist/
install
(
DIRECTORY
${
PROJ_ROOT
}
/paddle/dist/
...
...
paddle/api/paddle_api_config.py.in
浏览文件 @
ae174b33
...
@@ -8,9 +8,7 @@ CMAKE_DL_LIBS="@CMAKE_DL_LIBS@"
...
@@ -8,9 +8,7 @@ CMAKE_DL_LIBS="@CMAKE_DL_LIBS@"
WITH_PYTHON="@WITH_PYTHON@"
WITH_PYTHON="@WITH_PYTHON@"
PYTHON_LIBRARIES="@PYTHON_LIBRARIES@"
PYTHON_LIBRARIES="@PYTHON_LIBRARIES@"
WITH_GLOG="@WITH_GLOG@"
LIBGLOG_LIBRARY="@LIBGLOG_LIBRARY@"
LIBGLOG_LIBRARY="@LIBGLOG_LIBRARY@"
WITH_GFLAGS="@WITH_GFLAGS@"
GFLAGS_LIBRARIES="@GFLAGS_LIBRARIES@"
GFLAGS_LIBRARIES="@GFLAGS_LIBRARIES@"
GFLAGS_LOCATION="@GFLAGS_LOCATION@"
GFLAGS_LOCATION="@GFLAGS_LOCATION@"
CBLAS_LIBRARIES="@CBLAS_LIBS@"
CBLAS_LIBRARIES="@CBLAS_LIBS@"
...
...
paddle/api/paddle_ld_flags.py
浏览文件 @
ae174b33
...
@@ -47,10 +47,8 @@ try:
...
@@ -47,10 +47,8 @@ try:
self
.
with_python
=
PaddleLDFlag
.
cmake_bool
(
WITH_PYTHON
)
self
.
with_python
=
PaddleLDFlag
.
cmake_bool
(
WITH_PYTHON
)
self
.
python_libs
=
PYTHON_LIBRARIES
self
.
python_libs
=
PYTHON_LIBRARIES
self
.
with_glog
=
PaddleLDFlag
.
cmake_bool
(
WITH_GLOG
)
self
.
glog_libs
=
LIBGLOG_LIBRARY
self
.
glog_libs
=
LIBGLOG_LIBRARY
self
.
with_gflags
=
PaddleLDFlag
.
cmake_bool
(
WITH_GFLAGS
)
self
.
with_coverage
=
PaddleLDFlag
.
cmake_bool
(
WITH_COVERALLS
)
self
.
with_coverage
=
PaddleLDFlag
.
cmake_bool
(
WITH_COVERALLS
)
self
.
gflags_libs
=
GFLAGS_LIBRARIES
self
.
gflags_libs
=
GFLAGS_LIBRARIES
self
.
gflags_location
=
GFLAGS_LOCATION
self
.
gflags_location
=
GFLAGS_LOCATION
...
@@ -88,6 +86,8 @@ try:
...
@@ -88,6 +86,8 @@ try:
"-lpaddle_cuda"
,
"-lpaddle_cuda"
,
"-lpaddle_api"
,
"-lpaddle_api"
,
self
.
normalize_flag
(
self
.
protolib
),
self
.
normalize_flag
(
self
.
protolib
),
self
.
normalize_flag
(
self
.
glog_libs
),
self
.
normalize_flag
(
self
.
gflags_libs
),
self
.
normalize_flag
(
self
.
zlib
),
self
.
normalize_flag
(
self
.
zlib
),
self
.
normalize_flag
(
self
.
thread
),
self
.
normalize_flag
(
self
.
thread
),
self
.
normalize_flag
(
self
.
dl_libs
),
self
.
normalize_flag
(
self
.
dl_libs
),
...
@@ -96,10 +96,6 @@ try:
...
@@ -96,10 +96,6 @@ try:
if
self
.
with_python
:
if
self
.
with_python
:
libs
.
append
(
self
.
normalize_flag
(
self
.
python_libs
))
libs
.
append
(
self
.
normalize_flag
(
self
.
python_libs
))
if
self
.
with_glog
:
libs
.
append
(
self
.
normalize_flag
(
self
.
glog_libs
))
if
self
.
with_gflags
:
libs
.
append
(
self
.
normalize_flag
(
self
.
gflags_libs
))
if
self
.
with_gpu
:
if
self
.
with_gpu
:
libs
.
append
(
self
.
normalize_flag
(
self
.
curt
))
libs
.
append
(
self
.
normalize_flag
(
self
.
curt
))
if
self
.
with_coverage
:
if
self
.
with_coverage
:
...
...
paddle/scripts/submit_local.sh.in
浏览文件 @
ae174b33
...
@@ -21,8 +21,6 @@ function version(){
...
@@ -21,8 +21,6 @@ function version(){
echo
" with_double: @WITH_DOUBLE@"
echo
" with_double: @WITH_DOUBLE@"
echo
" with_python: @WITH_PYTHON@"
echo
" with_python: @WITH_PYTHON@"
echo
" with_rdma: @WITH_RDMA@"
echo
" with_rdma: @WITH_RDMA@"
echo
" with_glog: @WITH_GLOG@"
echo
" with_gflags: @WITH_GFLAGS@"
echo
" with_metric_learning: @WITH_METRIC@"
echo
" with_metric_learning: @WITH_METRIC@"
echo
" with_timer: @WITH_TIMER@"
echo
" with_timer: @WITH_TIMER@"
echo
" with_predict_sdk: @WITH_PREDICT_SDK@"
echo
" with_predict_sdk: @WITH_PREDICT_SDK@"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录