Merge pull request #592 from PaddlePaddle/develop_doc

Develop doc

.travis.yml

@@ -22,12 +22,7 @@ before_install:
 script:
   -  PATH=/tmp/go/bin:$PATH .travis/precommit.sh
   - |
-    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit 0; fi;
-    if [[ "$TRAVIS_BRANCH" != "develop"  && ! "$TRAVIS_BRANCH" =~ ^v[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then echo "not develop branch, no deploy"; exit 0; fi;
-    export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/master/scripts/deploy/deploy_docs.sh
-    export BOOK_DIR=`pwd`
-    cd ..
-    curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $BOOK_DIR
+     .travis/deploy_docs.sh
 notifications:
   email:
     on_success: change

.travis/deploy_docs.sh

+exit_code=0
+
+if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then exit $exit_code; fi;
+    
+# Deploy to the the content server if its a "develop" or "release/version" branch
+# The "develop_doc" branch is reserved to test full deploy process without impacting the real content.
+if [ "$TRAVIS_BRANCH" == "develop_doc" ]; then
+    PPO_SCRIPT_BRANCH=develop
+elif [[ "$TRAVIS_BRANCH" == "develop"  ||  "$TRAVIS_BRANCH" =~ ^v|release/[[:digit:]]+\.[[:digit:]]+(\.[[:digit:]]+)?(-\S*)?$ ]]; then
+    PPO_SCRIPT_BRANCH=master
+else
+    # Early exit, this branch doesn't require documentation build
+    exit $exit_code;
+fi
+
+export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/$PPO_SCRIPT_BRANCH/scripts/deploy/deploy_docs.sh
+
+docker run -it \
+    -e CONTENT_DEC_PASSWD=$CONTENT_DEC_PASSWD \
+    -e TRAVIS_BRANCH=$TRAVIS_BRANCH \
+    -e DEPLOY_DOCS_SH=$DEPLOY_DOCS_SH \
+    -e TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST \
+    -e PPO_SCRIPT_BRANCH=$PPO_SCRIPT_BRANCH \
+    -e PADDLE_ROOT=/book \
+    -v "$PWD:/book" \
+    -w /book \
+    paddlepaddle/paddle:latest-dev \
+    /bin/bash -c 'curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH /book /book/build/doc/ $PPO_SCRIPT_BRANCH' || exit_code=$(( exit_code | $? ))
+

04.word2vec/train.py

@@ -26,7 +26,6 @@ HIDDEN_SIZE = 256
 N = 5
 BATCH_SIZE = 100
 
-
 use_cuda = False  # set to True if training with GPU
 
 word_dict = paddle.dataset.imikolov.build_dict()