Merge pull request PaddlePaddle#9532 from weixing02/fluid_api

Fluid api
mikeseven · Mar 30, 2018 · 33b8b3d · 33b8b3d
2 parents 63cd5fb + cd5d9a0
commit 33b8b3d
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 9 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,2 +1,9 @@
+add_custom_target(paddle_apis ALL
+                  DEPENDS paddle_v2_apis paddle_fluid_apis)
+
+add_custom_target(paddle_docs ALL
+                  DEPENDS paddle_v2_docs paddle_v2_docs_cn
+                  paddle_fluid_docs paddle_fluid_docs_cn)
+
 add_subdirectory(v2)
 add_subdirectory(fluid)
diff --git a/doc/fluid/CMakeLists.txt b/doc/fluid/CMakeLists.txt
@@ -27,6 +27,8 @@ sphinx_add_target(paddle_fluid_docs
                   ${CMAKE_CURRENT_SOURCE_DIR}
                   ${SPHINX_HTML_DIR_EN})
 
+add_dependencies(paddle_fluid_docs gen_proto_py)
+
 # configured documentation tools and intermediate build results
 set(BINARY_BUILD_DIR_CN "${CMAKE_CURRENT_BINARY_DIR}/cn/_build")
 
@@ -47,3 +49,7 @@ sphinx_add_target(paddle_fluid_docs_cn
                   ${SPHINX_CACHE_DIR_CN}
                   ${CMAKE_CURRENT_SOURCE_DIR}
                   ${SPHINX_HTML_DIR_CN})
+
+add_dependencies(paddle_fluid_docs_cn gen_proto_py)
+
+add_subdirectory(api)
diff --git a/doc/fluid/api/CMakeLists.txt b/doc/fluid/api/CMakeLists.txt
@@ -0,0 +1,22 @@
+# configured documentation tools and intermediate build results
+set(BINARY_BUILD_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/_build")
+
+# Sphinx cache with pickled ReST documents
+set(SPHINX_CACHE_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/_doctrees")
+
+# HTML output director
+set(SPHINX_HTML_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/html")
+
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../templates/conf.py.en.in"
+    "${BINARY_BUILD_DIR_EN}/conf.py"
+    @ONLY)
+
+sphinx_add_target(paddle_fluid_apis
+                  html
+                  ${BINARY_BUILD_DIR_EN}
+                  ${SPHINX_CACHE_DIR_EN}
+                  ${CMAKE_CURRENT_SOURCE_DIR}
+                  ${SPHINX_HTML_DIR_EN})
+
+add_dependencies(paddle_fluid_apis  gen_proto_py framework_py_proto copy_paddle_pybind)
diff --git a/doc/v2/api/fluid/data_feeder.rst → doc/fluid/api/data_feeder.rst b/doc/v2/api/fluid/data_feeder.rst → doc/fluid/api/data_feeder.rst
diff --git a/doc/v2/api/fluid/evaluator.rst → doc/fluid/api/evaluator.rst b/doc/v2/api/fluid/evaluator.rst → doc/fluid/api/evaluator.rst
diff --git a/doc/v2/api/fluid/executor.rst → doc/fluid/api/executor.rst b/doc/v2/api/fluid/executor.rst → doc/fluid/api/executor.rst
diff --git a/doc/v2/api/fluid/gen_doc.py → doc/fluid/api/gen_doc.py b/doc/v2/api/fluid/gen_doc.py → doc/fluid/api/gen_doc.py
diff --git a/doc/v2/api/fluid/gen_doc.sh → doc/fluid/api/gen_doc.sh b/doc/v2/api/fluid/gen_doc.sh → doc/fluid/api/gen_doc.sh
diff --git a/doc/v2/api/fluid/index.rst → doc/fluid/api/index_en.rst b/doc/v2/api/fluid/index.rst → doc/fluid/api/index_en.rst
diff --git a/doc/v2/api/fluid/initializer.rst → doc/fluid/api/initializer.rst b/doc/v2/api/fluid/initializer.rst → doc/fluid/api/initializer.rst
diff --git a/doc/v2/api/fluid/io.rst → doc/fluid/api/io.rst b/doc/v2/api/fluid/io.rst → doc/fluid/api/io.rst
diff --git a/doc/v2/api/fluid/layers.rst → doc/fluid/api/layers.rst b/doc/v2/api/fluid/layers.rst → doc/fluid/api/layers.rst
diff --git a/doc/v2/api/fluid/nets.rst → doc/fluid/api/nets.rst b/doc/v2/api/fluid/nets.rst → doc/fluid/api/nets.rst
diff --git a/doc/v2/api/fluid/optimizer.rst → doc/fluid/api/optimizer.rst b/doc/v2/api/fluid/optimizer.rst → doc/fluid/api/optimizer.rst
diff --git a/doc/v2/api/fluid/param_attr.rst → doc/fluid/api/param_attr.rst b/doc/v2/api/fluid/param_attr.rst → doc/fluid/api/param_attr.rst
diff --git a/doc/v2/api/fluid/profiler.rst → doc/fluid/api/profiler.rst b/doc/v2/api/fluid/profiler.rst → doc/fluid/api/profiler.rst
diff --git a/doc/v2/api/fluid/regularizer.rst → doc/fluid/api/regularizer.rst b/doc/v2/api/fluid/regularizer.rst → doc/fluid/api/regularizer.rst
diff --git a/doc/v2/CMakeLists.txt b/doc/v2/CMakeLists.txt
@@ -20,13 +20,15 @@ configure_file(
     "${BINARY_BUILD_DIR_EN}/conf.py"
     @ONLY)
 
-sphinx_add_target(paddle_docs
+sphinx_add_target(paddle_v2_docs
                   html
                   ${BINARY_BUILD_DIR_EN}
                   ${SPHINX_CACHE_DIR_EN}
                   ${CMAKE_CURRENT_SOURCE_DIR}
                   ${SPHINX_HTML_DIR_EN})
 
+add_dependencies(paddle_v2_docs gen_proto_py)
+
 # configured documentation tools and intermediate build results
 set(BINARY_BUILD_DIR_CN "${CMAKE_CURRENT_BINARY_DIR}/cn/_build")
 
@@ -41,11 +43,13 @@ configure_file(
     "${BINARY_BUILD_DIR_CN}/conf.py"
     @ONLY)
 
-sphinx_add_target(paddle_docs_cn
+sphinx_add_target(paddle_v2_docs_cn
                   html
                   ${BINARY_BUILD_DIR_CN}
                   ${SPHINX_CACHE_DIR_CN}
                   ${CMAKE_CURRENT_SOURCE_DIR}
                   ${SPHINX_HTML_DIR_CN})
 
+add_dependencies(paddle_v2_docs_cn gen_proto_py)
+
 add_subdirectory(api)
diff --git a/doc/v2/api/CMakeLists.txt b/doc/v2/api/CMakeLists.txt
@@ -12,9 +12,11 @@ configure_file(
     "${BINARY_BUILD_DIR_EN}/conf.py"
     @ONLY)
 
-sphinx_add_target(paddle_api_docs
+sphinx_add_target(paddle_v2_apis
                   html
                   ${BINARY_BUILD_DIR_EN}
                   ${SPHINX_CACHE_DIR_EN}
                   ${CMAKE_CURRENT_SOURCE_DIR}
                   ${SPHINX_HTML_DIR_EN})
+
+add_dependencies(paddle_v2_apis  gen_proto_py framework_py_proto copy_paddle_pybind)
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
@@ -125,9 +125,8 @@ EOF
             -DWITH_AVX=${WITH_AVX:-ON} \
             -DWITH_SWIG_PY=ON \
             -DWITH_STYLE_CHECK=OFF
-        make -j `nproc` gen_proto_py framework_py_proto
-        make -j `nproc` copy_paddle_pybind
-        make -j `nproc` paddle_docs paddle_docs_cn paddle_api_docs
+
+        make -j `nproc` paddle_docs paddle_apis
         popd
     fi
 

diff --git a/paddle/scripts/travis/build_doc.sh b/paddle/scripts/travis/build_doc.sh
@@ -7,9 +7,8 @@ cd $TRAVIS_BUILD_DIR/build
 
 # Compile Documentation only.
 cmake .. -DCMAKE_BUILD_TYPE=Release -DWITH_GPU=OFF -DWITH_MKL=OFF -DWITH_DOC=ON -DWITH_STYLE_CHECK=OFF
-make -j `nproc` gen_proto_py framework_py_proto
-make -j `nproc` copy_paddle_pybind
-make -j `nproc` paddle_docs paddle_docs_cn paddle_api_docs
+
+make -j `nproc` paddle_docs paddle_apis
 
 # check websites for broken links
 linkchecker doc/v2/en/html/index.html