diff --git a/doc/templates/conf.py.cn.in b/doc/templates/conf.py.cn.in index 95cad835b11816f4d2e256c2abd662a545a5bad2..0faa3c78d61052162b457f94d14fdc39256b266e 100644 --- a/doc/templates/conf.py.cn.in +++ b/doc/templates/conf.py.cn.in @@ -15,12 +15,11 @@ import sys import os, subprocess import shlex from recommonmark import parser, transform +sys.path.append(os.path.abspath('@PROJ_ROOT@/python')) try: - import py_paddle import paddle import paddle.v2 except ImportError: - print("Must install paddle python package before generating documentation") sys.exit(1) MarkdownParser = parser.CommonMarkParser diff --git a/doc/templates/conf.py.en.in b/doc/templates/conf.py.en.in index b477f0120c4fa0544012080b7cfb8572d3c44b04..23d73189d926db82a44bd8cd27ce5fa0a4ceb342 100644 --- a/doc/templates/conf.py.en.in +++ b/doc/templates/conf.py.en.in @@ -15,12 +15,11 @@ import sys import os, subprocess import shlex from recommonmark import parser, transform +sys.path.append(os.path.abspath('@PROJ_ROOT@/python')) try: - import py_paddle import paddle import paddle.v2 except ImportError: - print("Must install paddle python package before generating documentation") sys.exit(1) diff --git a/paddle/scripts/travis/build_doc.sh b/paddle/scripts/travis/build_doc.sh index 33fb5d84e2701c163b5d1b1bb3362ee81ebb34ea..9785fa0c056cb5a57b3ee875d9776df0b8ca3e73 100755 --- a/paddle/scripts/travis/build_doc.sh +++ b/paddle/scripts/travis/build_doc.sh @@ -5,13 +5,6 @@ set -e mkdir -p $TRAVIS_BUILD_DIR/build cd $TRAVIS_BUILD_DIR/build -# Compile paddle binaries first -cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_DOC=OFF -DWITH_MKLDNN=OFF -DWITH_MKLML=OFF -DWITH_GOLANG=ON -DWITH_STYLE_CHECK=OFF - -mkdir output -make -j `nproc` -find .. -name '*whl' | xargs pip install # install all wheels. -rm -rf * # Compile Documentation only. cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_MKLDNN=OFF -DWITH_MKLML=OFF -DWITH_DOC=ON make -j `nproc` paddle_docs paddle_docs_cn @@ -35,6 +28,7 @@ TARGET_BRANCH="gh-pages" SOURCE_BRANCH="master" # Clone the repo to output directory +mkdir output git clone $REPO output cd output