Skip to content

Commit 72149c1

Browse files
authored
scripts: clean bash scripts. (#10721)
* scripts: clean bash scripts. * Fix build related documents.
1 parent 1ba2581 commit 72149c1

File tree

12 files changed

+14
-469
lines changed

12 files changed

+14
-469
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,3 @@ RUN echo 'root:root' | chpasswd
101101
RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
102102
RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
103103
EXPOSE 22
104-
105-
# development image default do build work
106-
CMD ["bash", "/paddle/paddle/scripts/docker/build.sh"]

Dockerfile.android

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,3 @@ RUN mkdir -p ${ANDROID_TOOLCHAINS_DIR} && \
4040
unzip -q android-ndk-r14b-linux-x86_64.zip && \
4141
mv android-ndk-r14b ${ANDROID_NDK_HOME} && \
4242
rm -rf /opt/android-ndk-tmp
43-
44-
CMD ["bash", "/paddle/paddle/scripts/docker/build_android.sh"]

doc/v2/build_and_install/build_from_source_cn.rst

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ PaddlePaddle需要使用Docker环境完成编译,这样可以免去单独安
3535
# 2. 可选步骤:源码中构建用于编译PaddlePaddle的Docker镜像
3636
docker build -t paddle:dev .
3737
# 3. 执行下面的命令编译CPU-Only的二进制
38-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 bash -x /paddle/paddle/scripts/paddle_build.sh build
38+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 ./paddle/scripts/paddle_build.sh build
3939
# 4. 或者也可以使用为上述可选步骤构建的镜像(必须先执行第2步)
40-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddle:dev
40+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddle:dev ./paddle/scripts/paddle_build.sh build
4141
42-
注:上述命令把当前目录(源码树根目录)映射为 container 里的 :code:`/paddle` 目录。如果使用自行
43-
构建的镜像(上述第4步)会执行 :code:`Dockerfile` 描述的默认入口程序 :code:`build.sh` 可以省略步骤3中
44-
最后的执行脚本的命令。
42+
注:上述命令把当前目录(源码树根目录)映射为 container 里的 :code:`/paddle` 目录。
4543

4644
编译完成后会在build/python/dist目录下生成输出的whl包,可以选在在当前机器安装也可以拷贝到目标机器安装:
4745

@@ -72,15 +70,15 @@ PaddlePaddle需要使用Docker环境完成编译,这样可以免去单独安
7270

7371
.. code-block:: bash
7472
75-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=ON" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 bash -x /paddle/paddle/scripts/docker/build.sh
73+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=ON" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 ./paddle/scripts/paddle_build.sh test
7674
7775
如果期望执行其中一个单元测试,(比如 :code:`test_sum_op` ):
7876

7977
.. code-block:: bash
8078
81-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 /bin/bash
82-
bash /paddle/paddle/scripts/docker/build.sh
83-
cd /paddle/build
79+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 /bin/bash
80+
./paddle/scripts/paddle_build.sh build
81+
cd build
8482
ctest -R test_sum_op -V
8583
8684
.. _faq_docker:

doc/v2/build_and_install/build_from_source_en.rst

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ Or you can build your own image from source as the optional step below:
3434
# 2. Optional: build development docker image from source
3535
docker build -t paddle:dev .
3636
# 3. Run the following command to build a CPU-Only binaries
37-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 bash -x /paddle/paddle/scripts/paddle_build.sh build
37+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 ./paddle/scripts/paddle_build.sh build
3838
# 4. Or, use your built Docker image to build PaddlePaddle (must run step 2)
39-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddle:dev
39+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=OFF" paddle:dev ./paddle/scripts/paddle_build.sh build
4040
4141
NOTE: The above command try to mount the current working directory (root directory of source code)
42-
into :code:`/paddle` directory inside docker container. If you are using your own image
43-
(Step 4) it will run default entry-point :code:`build.sh` , so you could omit the last
44-
command in step 3.
42+
into :code:`/paddle` directory inside docker container.
4543

4644
When the compile finishes, you can get the output whl package under
4745
build/python/dist, then you can choose to install the whl on local
@@ -74,15 +72,15 @@ Set :code:`WITH_GPU=ON` Can also run tests on GPU.
7472

7573
.. code-block:: bash
7674
77-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=ON" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 bash -x paddle/paddle/scripts/docker/build.sh
75+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=ON" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 ./paddle/scripts/paddle_build.sh test
7876
7977
If you wish to run only one unit test, like :code:`test_sum_op`:
8078

8179
.. code-block:: bash
8280
83-
docker run -it -v $PWD:/paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 /bin/bash
84-
bash /paddle/paddle/scripts/docker/build.sh
85-
cd /paddle/build
81+
docker run -it -v $PWD:/paddle -w /paddle -e "WITH_GPU=OFF" -e "WITH_TESTING=ON" -e "RUN_TEST=OFF" paddlepaddle/paddle_manylinux_devel:cuda8.0_cudnn5 /bin/bash
82+
./paddle/scripts/paddle_build.sh build
83+
cd build
8684
ctest -R test_sum_op -V
8785
8886
.. _faq_docker:

paddle/scripts/docker/build.sh

Lines changed: 0 additions & 256 deletions
This file was deleted.

0 commit comments

Comments
 (0)