Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add paddle version of pip install and docker #7110

Merged
merged 2 commits into from
Dec 29, 2017
Merged

add paddle version of pip install and docker #7110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e188f0c
add paddle version of pip install
luotao1 Dec 29, 2017
c144261
add paddle version of docker
luotao1 Dec 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions doc/getstarted/build_and_install/docker_install_cn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
获取PaddlePaddle的Docker镜像
------------------------------

执行下面的命令获取最新的PaddlePaddle Docker镜像
执行下面的命令获取最新的PaddlePaddle Docker镜像，版本为cpu_avx_mkl：

.. code-block:: bash

Expand All @@ -27,7 +27,7 @@

docker pull docker.paddlepaddle.org/paddle

下载GPU版本的Docker镜像：
下载GPU版本（cuda8.0_cudnn5_avx_mkl）的Docker镜像：

.. code-block:: bash

Expand All @@ -54,7 +54,7 @@
.. _docker_run:

在Docker中执行PaddlePaddle训练程序
------------------------------
----------------------------------

假设您已经在当前目录（比如在/home/work）编写了一个PaddlePaddle的程序 :code:`train.py` （可以参考
`PaddlePaddleBook <http://www.paddlepaddle.org/docs/develop/book/01.fit_a_line/index.cn.html>`_
Expand Down Expand Up @@ -82,7 +82,7 @@
.. _docker_run_book:

使用Docker启动PaddlePaddle Book教程
------------------------------
-----------------------------------

使用Docker可以快速在本地启动一个包含了PaddlePaddle官方Book教程的Jupyter Notebook，可以通过网页浏览。
PaddlePaddle Book是为用户和开发者制作的一个交互式的Jupyter Notebook。
Expand Down
6 changes: 3 additions & 3 deletions doc/getstarted/build_and_install/docker_install_en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ After you've read above tutorials you may proceed the following steps.
Pull PaddlePaddle Docker Image
------------------------------

Run the following command to download the latest Docker images:
Run the following command to download the latest Docker images, the version is cpu_avx_mkl:

.. code-block:: bash

Expand All @@ -28,7 +28,7 @@ For users in China, we provide a faster mirror:

docker pull docker.paddlepaddle.org/paddle

Download GPU version images:
Download GPU version (cuda8.0_cudnn5_avx_mkl) images:

.. code-block:: bash

Expand Down Expand Up @@ -58,7 +58,7 @@ and run:
.. _docker_run:

Launch your training program in Docker
------------------------------
--------------------------------------

Assume that you have already written a PaddlePaddle program
named :code:`train.py` under directory :code:`/home/work` (refer to
Expand Down
4 changes: 2 additions & 2 deletions doc/getstarted/build_and_install/pip_install_cn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ PaddlePaddle可以使用常用的Python包管理工具
------------------------------


执行下面的命令即可在当前机器上安装PaddlePaddle的运行时环境，并自动下载安装依赖软件。
执行下面的命令即可在当前机器上安装PaddlePaddle的运行时环境，并自动下载安装依赖软件，版本为cpu_avx_openblas。

.. code-block:: bash

pip install paddlepaddle


如果需要安装支持GPU的版本，需要执行：
如果需要安装支持GPU的版本（cuda7.5_cudnn5_avx_openblas），需要执行：

.. code-block:: bash

Expand Down
4 changes: 2 additions & 2 deletions doc/getstarted/build_and_install/pip_install_en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Install Using pip
------------------------------

Run the following command to install PaddlePaddle on the current
machine, it will also download requirements.
machine, it will also download requirements, the version is cpu_avx_openblas.

.. code-block:: bash

pip install paddlepaddle


If you wish to install GPU version, just run:
If you wish to install GPU version (cuda7.5_cudnn5_avx_openblas), just run:

.. code-block:: bash

Expand Down
4 changes: 2 additions & 2 deletions doc/getstarted/index_cn.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
++++++++

PaddlePaddle支持使用pip快速安装，目前支持CentOS 6以上, Ubuntu 14.04以及MacOS 10.12，并安装有Python2.7。
执行下面的命令完成快速安装：
执行下面的命令完成快速安装，版本为cpu_avx_openblas：

.. code-block:: bash

pip install paddlepaddle

如果需要安装支持GPU的版本，需要执行：
如果需要安装支持GPU的版本（cuda7.5_cudnn5_avx_openblas），需要执行：

.. code-block:: bash

Expand Down
4 changes: 2 additions & 2 deletions doc/getstarted/index_en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Quick Install

You can use pip to install PaddlePaddle with a single command, supports
CentOS 6 above, Ubuntu 14.04 above or MacOS 10.12, with Python 2.7 installed.
Simply run the following command to install:
Simply run the following command to install, the version is cpu_avx_openblas:

.. code-block:: bash

pip install paddlepaddle

If you need to install GPU version, run:
If you need to install GPU version (cuda7.5_cudnn5_avx_openblas), run:

.. code-block:: bash

Expand Down