Deploy to GitHub Pages: 5bf37b91

develop/doc/_sources/getstarted/build_and_install/docker_install_en.rst.txt

@@ -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
 
@@ -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
 
@@ -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 

develop/doc/_sources/getstarted/build_and_install/pip_install_en.rst.txt

@@ -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
 

develop/doc/_sources/getstarted/index_en.rst.txt

@@ -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
 

develop/doc/getstarted/build_and_install/docker_install_en.html

@@ -226,7 +226,7 @@ tutorial to start running docker under windows.</p>
 <p>After you&#8217;ve read above tutorials you may proceed the following steps.</p>
 <div class="section" id="pull-paddlepaddle-docker-image">
 <span id="docker-pull"></span><h2>Pull PaddlePaddle Docker Image<a class="headerlink" href="#pull-paddlepaddle-docker-image" title="Permalink to this headline">¶</a></h2>
-<p>Run the following command to download the latest Docker images:</p>
+<p>Run the following command to download the latest Docker images, the version is cpu_avx_mkl:</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>docker pull paddlepaddle/paddle
 </pre></div>
@@ -238,7 +238,7 @@ tutorial to start running docker under windows.</p>
 </pre></div>
 </div>
 </div></blockquote>
-<p>Download GPU version images:</p>
+<p>Download GPU version (cuda8.0_cudnn5_avx_mkl) images:</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>docker pull paddlepaddle/paddle:latest-gpu
 docker pull docker.paddlepaddle.org/paddle:latest-gpu

develop/doc/getstarted/build_and_install/pip_install_en.html

@@ -224,13 +224,13 @@ most of current Linux systems or MacOS.</p>
 <div class="section" id="pip-install">
 <span id="id1"></span><h2>Install Using pip<a class="headerlink" href="#pip-install" title="Permalink to this headline">¶</a></h2>
 <p>Run the following command to install PaddlePaddle on the current
-machine, it will also download requirements.</p>
+machine, it will also download requirements, the version is cpu_avx_openblas.</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle
 </pre></div>
 </div>
 </div></blockquote>
-<p>If you wish to install GPU version, just run:</p>
+<p>If you wish to install GPU version (cuda7.5_cudnn5_avx_openblas), just run:</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle-gpu
 </pre></div>

develop/doc/getstarted/index_en.html

@@ -216,13 +216,13 @@
 <span id="id1"></span><h2>Quick Install<a class="headerlink" href="#quick-install" title="Permalink to this headline">¶</a></h2>
 <p>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:</p>
+Simply run the following command to install, the version is cpu_avx_openblas:</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle
 </pre></div>
 </div>
 </div></blockquote>
-<p>If you need to install GPU version, run:</p>
+<p>If you need to install GPU version (cuda7.5_cudnn5_avx_openblas), run:</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle-gpu
 </pre></div>

develop/doc_cn/_sources/getstarted/build_and_install/docker_install_cn.rst.txt

@@ -15,7 +15,7 @@
 获取PaddlePaddle的Docker镜像
 ------------------------------
 
-执行下面的命令获取最新的PaddlePaddle Docker镜像
+执行下面的命令获取最新的PaddlePaddle Docker镜像，版本为cpu_avx_mkl：
 
   .. code-block:: bash
 
@@ -27,7 +27,7 @@
 
      docker pull docker.paddlepaddle.org/paddle
 
-下载GPU版本的Docker镜像：
+下载GPU版本（cuda8.0_cudnn5_avx_mkl）的Docker镜像：
 
   .. code-block:: bash
 
@@ -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>`_ 
@@ -82,7 +82,7 @@
 .. _docker_run_book:
 
 使用Docker启动PaddlePaddle Book教程
-------------------------------
+-----------------------------------
 
 使用Docker可以快速在本地启动一个包含了PaddlePaddle官方Book教程的Jupyter Notebook，可以通过网页浏览。
 PaddlePaddle Book是为用户和开发者制作的一个交互式的Jupyter Notebook。

develop/doc_cn/_sources/getstarted/build_and_install/pip_install_cn.rst.txt

@@ -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
 

develop/doc_cn/_sources/getstarted/index_cn.rst.txt

@@ -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
 

develop/doc_cn/getstarted/build_and_install/docker_install_cn.html

@@ -238,7 +238,7 @@
 <p>在了解Docker的基本使用方法之后，即可开始下面的步骤：</p>
 <div class="section" id="paddlepaddledocker">
 <span id="docker-pull"></span><h2>获取PaddlePaddle的Docker镜像<a class="headerlink" href="#paddlepaddledocker" title="永久链接至标题">¶</a></h2>
-<p>执行下面的命令获取最新的PaddlePaddle Docker镜像</p>
+<p>执行下面的命令获取最新的PaddlePaddle Docker镜像，版本为cpu_avx_mkl：</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>docker pull paddlepaddle/paddle
 </pre></div>
@@ -250,7 +250,7 @@
 </pre></div>
 </div>
 </div></blockquote>
-<p>下载GPU版本的Docker镜像：</p>
+<p>下载GPU版本（cuda8.0_cudnn5_avx_mkl）的Docker镜像：</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>docker pull paddlepaddle/paddle:latest-gpu
 docker pull docker.paddlepaddle.org/paddle:latest-gpu

develop/doc_cn/getstarted/build_and_install/pip_install_cn.html

@@ -235,13 +235,13 @@
 完成安装，并可以在大多数主流的Linux操作系统以及MacOS上执行。</p>
 <div class="section" id="pip-install">
 <span id="id2"></span><h2>使用pip安装<a class="headerlink" href="#pip-install" title="永久链接至标题">¶</a></h2>
-<p>执行下面的命令即可在当前机器上安装PaddlePaddle的运行时环境，并自动下载安装依赖软件。</p>
+<p>执行下面的命令即可在当前机器上安装PaddlePaddle的运行时环境，并自动下载安装依赖软件，版本为cpu_avx_openblas。</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle
 </pre></div>
 </div>
 </div></blockquote>
-<p>如果需要安装支持GPU的版本，需要执行：</p>
+<p>如果需要安装支持GPU的版本（cuda7.5_cudnn5_avx_openblas），需要执行：</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle-gpu
 </pre></div>

develop/doc_cn/getstarted/index_cn.html

@@ -228,13 +228,13 @@
 <div class="section" id="quick-install">
 <span id="id2"></span><h2>快速安装<a class="headerlink" href="#quick-install" title="永久链接至标题">¶</a></h2>
 <p>PaddlePaddle支持使用pip快速安装，目前支持CentOS 6以上, Ubuntu 14.04以及MacOS 10.12，并安装有Python2.7。
-执行下面的命令完成快速安装：</p>
+执行下面的命令完成快速安装，版本为cpu_avx_openblas：</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle
 </pre></div>
 </div>
 </div></blockquote>
-<p>如果需要安装支持GPU的版本，需要执行：</p>
+<p>如果需要安装支持GPU的版本（cuda7.5_cudnn5_avx_openblas），需要执行：</p>
 <blockquote>
 <div><div class="highlight-bash"><div class="highlight"><pre><span></span>pip install paddlepaddle-gpu
 </pre></div>