Skip to content

Commit d605560

Browse files
authored
Merge pull request #3488 from luotao1/docker_doc
build documentation don't need install Paddle before
2 parents 245f622 + 72be3b9 commit d605560

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

paddle/scripts/docker/build.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,13 @@ EOF
8282
fi
8383

8484

85-
# To build documentation, we need to run cmake again after installing
86-
# PaddlePaddle. This awkwardness is due to
87-
# https://github.com/PaddlePaddle/Paddle/issues/1854. It also
88-
# describes a solution.
8985
if [[ ${WITH_DOC:-OFF} == "ON" ]]; then
9086
cat <<EOF
9187
========================================
9288
Building documentation ...
9389
In /paddle/build_doc
9490
========================================
9591
EOF
96-
# build documentation need install Paddle before
97-
make install -j `nproc`
98-
pip install /usr/local/opt/paddle/share/wheels/*.whl
99-
paddle version
100-
10192
mkdir -p /paddle/build_doc
10293
pushd /paddle/build_doc
10394
cmake .. \
@@ -106,7 +97,8 @@ EOF
10697
-DWITH_AVX=${WITH_AVX:-ON} \
10798
-DWITH_SWIG_PY=ON \
10899
-DWITH_STYLE_CHECK=OFF
109-
make paddle_docs paddle_docs_cn
100+
make -j `nproc` gen_proto_py
101+
make -j `nproc` paddle_docs paddle_docs_cn
110102
popd
111103
fi
112104

@@ -182,3 +174,7 @@ ADD go/cmd/master/master /usr/bin/
182174
# default command shows the paddle version and exit
183175
CMD ["paddle", "version"]
184176
EOF
177+
178+
set +xe
179+
printf "If you need to install PaddlePaddle in develop docker image,"
180+
printf "please make install or pip install build/python/dist/*.whl.\n"

0 commit comments

Comments
 (0)