From 0344c086e53a92822654741773ec839362c2a4f5 Mon Sep 17 00:00:00 2001 From: qijun Date: Thu, 20 Apr 2017 19:19:44 +0800 Subject: [PATCH] fix build.sh --- paddle/scripts/docker/build.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh index 50b083fb39..c1e3f39888 100644 --- a/paddle/scripts/docker/build.sh +++ b/paddle/scripts/docker/build.sh @@ -42,7 +42,20 @@ if [[ ${RUN_TEST:-OFF} == "ON" ]]; then make coveralls fi make install +pip install /usr/opt/paddle/share/wheels/*.whl +if [ ${WITH_DOC} == "ON" ]; then + mkdir -p /paddle/build_doc + pushd /paddle/build_doc + cmake .. \ + -DWITH_DOC=ON \ + -DWITH_GPU=OFF \ + -DWITH_AVX=${WITH_AVX:-OFF} \ + -DWITH_SWIG_PY=ON \ + -DWITH_STYLE_CHECK=OFF + make paddle_docs paddle_docs_cn + popd +fi # generate deb package for current build # FIXME(typhoonzero): should we remove paddle/scripts/deb ? # FIXME: CPACK_DEBIAN_PACKAGE_DEPENDS removes all dev dependencies, must @@ -100,18 +113,6 @@ RUN dpkg -i /usr/local/opt/paddle/deb/*.deb && \ rm -f /usr/local/opt/paddle/deb/*.deb && \ pip install /usr/opt/paddle/share/wheels/*.whl && \ paddle version -if [ ${WITH_DOC} == "ON" ]; then - mkdir -p /paddle/build_doc - pushd /paddle/build_doc - cmake .. \ - -DWITH_DOC=ON \ - -DWITH_GPU=OFF \ - -DWITH_AVX=${WITH_AVX:-OFF} \ - -DWITH_SWIG_PY=ON \ - -DWITH_STYLE_CHECK=OFF - make paddle_docs paddle_docs_cn - popd -fi ${CPU_DOCKER_PYTHON_HOME_ENV} ${DOCKERFILE_CUDNN_DSO} ${DOCKERFILE_GPU_ENV} -- GitLab