Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
兽拳
Paddle
提交
748c2d3e
P
Paddle
项目概览
兽拳
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
748c2d3e
编写于
1月 28, 2019
作者:
T
Tao Luo
提交者:
GitHub
1月 28, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15530 from luotao1/remove_with_doc
remove legacy WITH_DOC option
上级
b62b756b
c42ef5bf
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
0 addition
and
186 deletion
+0
-186
CMakeLists.txt
CMakeLists.txt
+0
-6
Dockerfile
Dockerfile
+0
-2
cmake/FindSphinx.cmake
cmake/FindSphinx.cmake
+0
-147
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+0
-31
未找到文件。
CMakeLists.txt
浏览文件 @
748c2d3e
...
...
@@ -276,9 +276,3 @@ add_subdirectory(paddle)
if
(
WITH_PYTHON
)
add_subdirectory
(
python
)
endif
()
if
(
WITH_DOC
)
find_package
(
Sphinx REQUIRED
)
find_python_module
(
recommonmark REQUIRED
)
add_subdirectory
(
doc
)
endif
()
Dockerfile
浏览文件 @
748c2d3e
...
...
@@ -11,12 +11,10 @@ RUN /bin/bash -c 'if [[ -n ${UBUNTU_MIRROR} ]]; then sed -i 's#http://archive.ub
# ENV variables
ARG
WITH_GPU
ARG
WITH_AVX
ARG
WITH_DOC
ENV
WOBOQ OFF
ENV
WITH_GPU=${WITH_GPU:-ON}
ENV
WITH_AVX=${WITH_AVX:-ON}
ENV
WITH_DOC=${WITH_DOC:-OFF}
ENV
HOME /root
# Add bash enhancements
...
...
cmake/FindSphinx.cmake
已删除
100644 → 0
浏览文件 @
b62b756b
# - This module looks for Sphinx
# Find the Sphinx documentation generator
#
# This modules defines
# SPHINX_EXECUTABLE
# SPHINX_FOUND
find_program
(
SPHINX_EXECUTABLE
NAMES sphinx-build
PATHS
/usr/bin
/usr/local/bin
/opt/local/bin
DOC
"Sphinx documentation generator"
)
if
(
NOT SPHINX_EXECUTABLE
)
set
(
_Python_VERSIONS
2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5
)
foreach
(
_version
${
_Python_VERSIONS
}
)
set
(
_sphinx_NAMES sphinx-build-
${
_version
}
)
find_program
(
SPHINX_EXECUTABLE
NAMES
${
_sphinx_NAMES
}
PATHS
/usr/bin
/usr/local/bin
/opt/loca/bin
DOC
"Sphinx documentation generator"
)
endforeach
()
endif
()
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Sphinx DEFAULT_MSG
SPHINX_EXECUTABLE
)
option
(
SPHINX_HTML_OUTPUT
"Build a single HTML with the whole content."
ON
)
option
(
SPHINX_DIRHTML_OUTPUT
"Build HTML pages, but with a single directory per document."
OFF
)
option
(
SPHINX_HTMLHELP_OUTPUT
"Build HTML pages with additional information for building a documentation collection in htmlhelp."
OFF
)
option
(
SPHINX_QTHELP_OUTPUT
"Build HTML pages with additional information for building a documentation collection in qthelp."
OFF
)
option
(
SPHINX_DEVHELP_OUTPUT
"Build HTML pages with additional information for building a documentation collection in devhelp."
OFF
)
option
(
SPHINX_EPUB_OUTPUT
"Build HTML pages with additional information for building a documentation collection in epub."
OFF
)
option
(
SPHINX_LATEX_OUTPUT
"Build LaTeX sources that can be compiled to a PDF document using pdflatex."
OFF
)
option
(
SPHINX_MAN_OUTPUT
"Build manual pages in groff format for UNIX systems."
OFF
)
option
(
SPHINX_TEXT_OUTPUT
"Build plain text files."
OFF
)
mark_as_advanced
(
SPHINX_EXECUTABLE
SPHINX_HTML_OUTPUT
SPHINX_DIRHTML_OUTPUT
SPHINX_HTMLHELP_OUTPUT
SPHINX_QTHELP_OUTPUT
SPHINX_DEVHELP_OUTPUT
SPHINX_EPUB_OUTPUT
SPHINX_LATEX_OUTPUT
SPHINX_MAN_OUTPUT
SPHINX_TEXT_OUTPUT
)
function
(
Sphinx_add_target target_name builder conf cache source destination
)
add_custom_target
(
${
target_name
}
ALL
COMMAND
${
SPHINX_EXECUTABLE
}
-b
${
builder
}
-d
${
cache
}
-c
${
conf
}
${
source
}
${
destination
}
COMMENT
"Generating sphinx documentation:
${
builder
}
"
COMMAND cd
${
destination
}
&& ln -sf ./index_*.html index.html
)
set_property
(
DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES
${
destination
}
)
endfunction
()
# Target dependencies can be optionally listed at the end.
function
(
Sphinx_add_targets target_base_name conf source base_destination
)
set
(
_dependencies
)
foreach
(
arg IN LISTS ARGN
)
set
(
_dependencies
${
_dependencies
}
${
arg
}
)
endforeach
()
if
(
${
SPHINX_HTML_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_html html
${
conf
}
${
source
}
${
base_destination
}
/html
)
add_dependencies
(
${
target_base_name
}
_html
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_DIRHTML_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_dirhtml dirhtml
${
conf
}
${
source
}
${
base_destination
}
/dirhtml
)
add_dependencies
(
${
target_base_name
}
_dirhtml
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_QTHELP_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_qthelp qthelp
${
conf
}
${
source
}
${
base_destination
}
/qthelp
)
add_dependencies
(
${
target_base_name
}
_qthelp
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_DEVHELP_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_devhelp devhelp
${
conf
}
${
source
}
${
base_destination
}
/devhelp
)
add_dependencies
(
${
target_base_name
}
_devhelp
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_EPUB_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_epub epub
${
conf
}
${
source
}
${
base_destination
}
/epub
)
add_dependencies
(
${
target_base_name
}
_epub
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_LATEX_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_latex latex
${
conf
}
${
source
}
${
base_destination
}
/latex
)
add_dependencies
(
${
target_base_name
}
_latex
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_MAN_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_man man
${
conf
}
${
source
}
${
base_destination
}
/man
)
add_dependencies
(
${
target_base_name
}
_man
${
_dependencies
}
)
endif
()
if
(
${
SPHINX_TEXT_OUTPUT
}
)
Sphinx_add_target
(
${
target_base_name
}
_text text
${
conf
}
${
source
}
${
base_destination
}
/text
)
add_dependencies
(
${
target_base_name
}
_text
${
_dependencies
}
)
endif
()
if
(
${
BUILD_TESTING
}
)
sphinx_add_target
(
${
target_base_name
}
_linkcheck linkcheck
${
conf
}
${
source
}
${
base_destination
}
/linkcheck
)
add_dependencies
(
${
target_base_name
}
_linkcheck
${
_dependencies
}
)
endif
()
endfunction
()
paddle/scripts/paddle_build.sh
浏览文件 @
748c2d3e
...
...
@@ -173,7 +173,6 @@ function cmake_gen() {
-DCMAKE_BUILD_TYPE=
${
CMAKE_BUILD_TYPE
:-
Release
}
${
PYTHON_FLAGS
}
-DWITH_DSO=ON
-DWITH_DOC=
${
WITH_DOC
:-
OFF
}
-DWITH_GPU=
${
WITH_GPU
:-
OFF
}
-DWITH_AMD_GPU=
${
WITH_AMD_GPU
:-
OFF
}
-DWITH_DISTRIBUTE=
${
distibuted_flag
}
...
...
@@ -208,7 +207,6 @@ EOF
-DCMAKE_BUILD_TYPE
=
${
CMAKE_BUILD_TYPE
:-
Release
}
\
${
PYTHON_FLAGS
}
\
-DWITH_DSO
=
ON
\
-DWITH_DOC
=
${
WITH_DOC
:-
OFF
}
\
-DWITH_GPU
=
${
WITH_GPU
:-
OFF
}
\
-DWITH_AMD_GPU
=
${
WITH_AMD_GPU
:-
OFF
}
\
-DWITH_DISTRIBUTE
=
${
distibuted_flag
}
\
...
...
@@ -528,31 +526,6 @@ function bind_test() {
wait
}
function
gen_docs
()
{
mkdir
-p
${
PADDLE_ROOT
}
/build
cd
${
PADDLE_ROOT
}
/build
cat
<<
EOF
========================================
Building documentation ...
In /paddle/build
========================================
EOF
cmake ..
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DWITH_DOC
=
ON
\
-DWITH_GPU
=
OFF
\
-DWITH_MKL
=
OFF
make
-j
`
nproc
`
paddle_docs paddle_apis
# check websites for broken links
linkchecker doc/v2/en/html/index.html
linkchecker doc/v2/cn/html/index.html
linkchecker doc/v2/api/en/html/index.html
}
function
gen_doc_lib
()
{
mkdir
-p
${
PADDLE_ROOT
}
/build
cd
${
PADDLE_ROOT
}
/build
...
...
@@ -564,7 +537,6 @@ function gen_doc_lib() {
EOF
cmake ..
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DWITH_DOC
=
ON
\
-DWITH_GPU
=
OFF
\
-DWITH_MKL
=
OFF
\
-DWITH_FLUID_ONLY
=
ON
...
...
@@ -803,9 +775,6 @@ function main() {
bind_test
)
bind_test
;;
doc
)
gen_docs
;;
gen_doc_lib
)
gen_doc_lib
$2
;;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录