Skip to content

Commit b8c3364

Browse files
author
yi.wu
committed
update
1 parent 4761300 commit b8c3364

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

doc/getstarted/build_and_install/docker_install_cn.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ PaddlePaddle发布的docker镜像使用说明
88
------------------------------
99

1010
对于每一个PaddlePaddle版本,我们都会发布两种Docker镜像:开发镜像、运行镜像。运行镜像包括纯CPU版本和GPU版本以及其对应的非AVX版本。
11-
我们通过设置 `dockerhub.com <https://hub.docker.com/r/paddledev/paddle/>`_ 自动生成最新的docker镜像,可以在"tags"标签下找到最新的Paddle镜像版本。
12-
1. 开发镜像(纯CPU版本)::code:`paddlepaddle/paddle:<version>-dev`
11+
我们会在 `dockerhub.com <https://hub.docker.com/r/paddledev/paddle/>`_ 提供最新的docker镜像,可以在"tags"标签下找到最新的Paddle镜像版本。
12+
1. 开发镜像::code:`paddlepaddle/paddle:<version>-dev`
13+
1314
这个镜像包含了Paddle相关的开发工具以及编译和运行环境。用户可以使用开发镜像代替配置本地环境,完成开发,编译,发布,
1415
文档编写等工作。由于不同的Paddle的版本可能需要不同的依赖和工具,所以如果需要自行配置开发环境需要考虑版本的因素。
1516
开发镜像包含了以下工具:
@@ -62,7 +63,7 @@ PaddlePaddle发布的docker镜像使用说明
6263
6364
export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"
6465
export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
65-
docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:0.10.0rc1-gpu
66+
docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:<version>-gpu
6667
6768
3. 使用运行镜像发布你的AI程序
6869
假设您已经完成了一个AI训练的python程序 :code:`a.py`,这个程序是您在开发机上使用开发镜像完成开发。此时您可以运行这个命令在开发机上进行测试运行:
@@ -86,7 +87,7 @@ PaddlePaddle书籍是为用户和开发者制作的一个交互式的Jupyter Nod
8687

8788
.. code-block:: bash
8889
89-
docker run -p 8888:8888 paddlepaddle/book:<version>
90+
docker run -p 8888:8888 paddlepaddle/book
9091
9192
然后在浏览器中输入以下网址:
9293

@@ -110,7 +111,7 @@ PaddlePaddle书籍是为用户和开发者制作的一个交互式的Jupyter Nod
110111
docker build -t paddle:dev .
111112
112113
113-
请注意,默认情况下,:code:`docker build` 不会将源码导入到镜像中并编译它。如果我们想这样做,需要执行
114+
请注意,默认情况下,:code:`docker build` 不会将源码导入到镜像中并编译它。如果我们想这样做,需要构建完开发镜像,然后执行
114115

115116
.. code-block:: bash
116117

doc/getstarted/build_and_install/docker_install_en.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Usage of CPU-only and GPU Images
1414

1515
For each version of PaddlePaddle, we release 2 types of Docker images: development
1616
image and production image. Production image includes CPU-only version and a CUDA
17-
GPU version and their no-AVX versions. We do so by configuring
18-
`dockerhub.com <https://hub.docker.com/r/paddledev/paddle/>`_
19-
automatically generate the latest docker images. You can find the latest versions
20-
under "tags" tab at dockerhub.com.
21-
1. development image(support pure cpu) :code:`paddlepaddle/paddle:<version>-dev`
17+
GPU version and their no-AVX versions. We put the docker images on
18+
`dockerhub.com <https://hub.docker.com/r/paddledev/paddle/>`_. You can find the
19+
latest versions under "tags" tab at dockerhub.com.
20+
1. development image :code:`paddlepaddle/paddle:<version>-dev`
21+
2222
This image has packed related develop tools and runtime environment. Users and
2323
developers can use this image instead of their own local computer to accomplish
2424
development, build, releasing, document writing etc. While different version of
@@ -114,7 +114,7 @@ We provide a packaged book image, simply issue the command:
114114

115115
.. code-block:: bash
116116
117-
docker run -p 8888:8888 paddlepaddle/book:<version>
117+
docker run -p 8888:8888 paddlepaddle/book
118118
119119
Then, you would back and paste the address into the local browser:
120120

@@ -140,8 +140,8 @@ Windows -- in a consistent way.
140140
docker build -t paddle:dev .
141141
142142
Note that by default :code:`docker build` wouldn't import source
143-
tree into the image and build it. If we want to do that, we need
144-
to set a build arg:
143+
tree into the image and build it. If we want to do that, we need docker the
144+
development docker image and then run the following command:
145145

146146
.. code-block:: bash
147147

0 commit comments

Comments
 (0)