Skip to content

Commit

Permalink
routine_update_190506 (PaddlePaddle#845)
Browse files Browse the repository at this point in the history
  • Loading branch information
shanyi15 committed May 6, 2019
1 parent 71bd014 commit 89dd367
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 13 deletions.
7 changes: 6 additions & 1 deletion doc/fluid/beginners_guide/install/index_cn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ PaddlePaddle目前支持以下环境:

:code:`pip install paddlepaddle-gpu==[PaddlePaddle版本号]` (GPU版,具体版本号请参考 `这里 <https://pypi.org/project/paddlepaddle-gpu/#history>`_ )

- 如果您希望使用 `docker <https://www.docker.com>`_ 安装PaddlePaddle可以直接使用以下命令:
- 如果您希望使用 `docker <https://www.docker.com>`_ 安装PaddlePaddle,可以使用以下命令:

:code:`docker run --name [Name of container] -it -v $PWD:/paddle hub.baidubce.com/paddlepaddle/paddle:[docker版本号] /bin/bash`

如果您的机器不在中国大陆地区,可以直接从DockerHub拉取镜像

:code:`docker run --name [Name of container] -it -v $PWD:/paddle paddlepaddle/paddle:[docker版本号] /bin/bash`

其中[docker版本号]请查阅 `DockerHub <https://hub.docker.com/r/paddlepaddle/paddle/tags/>`_

.. toctree::
Expand Down
4 changes: 2 additions & 2 deletions doc/fluid/beginners_guide/install/index_en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PaddlePaddle currently supports the following environments:


Please make sure your environment meets the conditions above.
And the installation assumes your computer possesses 64-bit operating system, and AVX instruction set is supported by the processor, otherwise you should use the version of :code:`no_avx` in `whl package list - Dev <Tables_en.html/#ciwhls>`_ .
And the installation assumes your computer possesses 64-bit operating system, and AVX instruction set is supported by the processor, otherwise you should use the version of :code:`no_avx` in `whl package list - Dev <Tables_en.html/#ciwhls>`_ .


- If you are planning to use `pip <https://pypi.org/pypi/>`_ to install PaddlePaddle, please type the following commands directly:
Expand All @@ -30,7 +30,7 @@ And the installation assumes your computer possesses 64-bit operating system, an

- If you are planning to use `docker <https://www.docker.com>`_ to install PaddlePaddle, please type the following commands directly:

:code:`docker run --name [Name of container] -it -v $PWD:/paddle hub.baidubce.com/paddlepaddle/paddle:[docker version] /bin/bash`
:code:`docker run --name [Name of container] -it -v $PWD:/paddle paddlepaddle/paddle:[docker version] /bin/bash`

where [docker version] can be looked up in `DockerHub <https://hub.docker.com/r/paddlepaddle/paddle/tags/>`_

Expand Down
26 changes: 16 additions & 10 deletions doc/fluid/beginners_guide/install/install_Docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@

* GPU版的PaddlePaddle: `docker pull hub.baidubce.com/paddlepaddle/paddle:[版本号]-gpu-cuda9.0-cudnn7`

在`:`后请您填写PaddlePaddle版本号,例如1.2,更多请见[镜像简介](#dockers)
如果您的机器不在中国大陆地区,可以直接从DockerHub拉取镜像:

* CPU版的PaddlePaddle: `docker pull paddlepaddle/paddle:[版本号]`

* GPU版的PaddlePaddle: `docker pull paddlepaddle/paddle:[版本号]-gpu-cuda9.0-cudnn7`

在`:`后请您填写PaddlePaddle版本号,例如当前版本,更多请见[镜像简介](#dockers),上例中,`cuda9.0-cudnn7` 也仅作示意用,您可以访问[DockerHub](https://hub.docker.com/r/paddlepaddle/paddle/tags/)获取与您机器适配的镜像。

2. 构建、进入Docker容器

Expand All @@ -35,26 +41,26 @@
<table>
<thead>
<tr>
<th> 版本名称 </th>
<th> 版本说明 </th>
<th> 镜像源 </th>
<th> 镜像说明 </th>
</tr>
</thead>
<tbody>
<tr>
<td> hub.baidubce.com/paddlepaddle/paddle:latest </td>
<td> 最新的预先安装好PaddlePaddle CPU版本的镜像 </td>
</tr>
<tr>
<td> hub.baidubce.com/paddlepaddle/paddle:[Version] </td>
<td> 将version换成具体的版本,历史版本的预安装好PaddlePaddle的镜像 </td>
<td> 安装了指定版本PaddlePaddle </td>
</tr>
<tr>
<td> hub.baidubce.com/paddlepaddle/paddle:latest </td>
<td> 安装了开发版PaddlePaddle。注意:此版本可能包含尚未发布的特性和不稳定的功能,因此不推荐常规用户或在生产环境中使用。 </td>
</tr>
<tr>
<td> hub.baidubce.com/paddlepaddle/paddle:latest-gpu </td>
<td> 最新的预先安装好PaddlePaddle GPU版本的镜像 </td>
<td> 安装了开发版PaddlePaddle(支持GPU)。注意:此版本可能包含尚未发布的特性和不稳定的功能,因此不推荐常规用户或在生产环境中使用。 </td>
</tr>
<tr>
<td> hub.baidubce.com/paddlepaddle/paddle:latest-dev </td>
<td> 最新的PaddlePaddle的开发环境 </td>
<td> 安装了PaddlePaddle最新的开发环境 </td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 89dd367

Please sign in to comment.