[DOC CHANGE] Rerange Build docs & emphasize them in README.md (#151)

* Rerange Build docs & emphasize them in README.md

* Rerange Build docs & emphasize them in README.md

README.md

@@ -3,9 +3,9 @@
 
 Welcome to the PaddlePaddle GitHub.
 
-The software will be released on Sept. 30 with full documentation and installation support. 
+Do you wanna try and play PaddlePaddle? Just following the [Install Guide](http://www.paddlepaddle.org/doc/build/index.html) and [Quick Start](http://www.paddlepaddle.org/doc/demo/quick_start/index_en.html). The chinese version is [Install Guide](http://www.paddlepaddle.org/doc_cn/build_and_install/index.html) and [Quick Start](http://www.paddlepaddle.org/doc_cn/demo/quick_start/index.html).
 
-A pre-release version is available now for those who are eager to take a look.
+Please refer to our [release log](https://github.com/baidu/Paddle/releases) to track the latest feature of PaddlePaddle. 
 
 PaddlePaddle (PArallel Distributed Deep LEarning) is an easy-to-use,
 efficient, flexible and scalable deep learning platform, which is originally

doc/build/docker_install.md

-Docker installation guide
-====================
-PaddlePaddle provides some pre-compiled binary, including Docker images, ubuntu deb packages. It is welcomed to contributed more installation package of different linux distribution (such as ubuntu, centos, debian, gentoo and so on). We recommend to use Docker images to deploy PaddlePaddle.
-## Docker installation
-
-Docker is a tool designed to make it easier to create, deploy, and run applications by using containers.
-
-### PaddlePaddle Docker images
-There are six Docker images:
-
-- paddledev/paddle:cpu-latest: PaddlePaddle CPU binary image.
-- paddledev/paddle:gpu-latest: PaddlePaddle GPU binary image.
-- paddledev/paddle:cpu-devel-latest: PaddlePaddle CPU binary image plus source code.
-- paddledev/paddle:gpu-devel-latest: PaddlePaddle GPU binary image plus source code.
-- paddledev/paddle:cpu-demo-latest: PaddlePaddle CPU binary image plus source code and demo
-- paddledev/paddle:gpu-demo-latest: PaddlePaddle GPU binary image plus source code and demo
-
-Tags with latest will be replaced by a released version. 
-
-### Download and Run Docker images
-
-You have to install Docker in your machine which has linux kernel version 3.10+ first. You can refer to the official guide https://docs.docker.com/engine/installation/ for further information.
-
-You can use ```docker pull ```to download images first, or just launch a container with ```docker run```:
-```bash
-docker run -it paddledev/paddle:cpu-latest
-```
-
-If you want to launch container with GPU support, you need to set some environment variables at the same time:
-
-```bash
-export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}"
-export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
-docker run -it paddledev/paddle:gpu-latest
-``` 
-
-### Notice
-
-#### Performance
-
-Since Docker is based on the lightweight virtual containers, the CPU computing performance maintains well. And GPU driver and equipments are all mapped to the container, so the GPU computing performance would not be seriously affected.
-
-If you use high performance nic, such as RDMA(RoCE 40GbE or IB 56GbE), Ethernet(10GbE), it is recommended to use config "-net = host".
-
-
-
-
-#### Remote access
-If you want to enable ssh access background, you need to build an image by yourself. Please refer to official guide https://docs.docker.com/engine/reference/builder/ for further information.
-
-Following is a simple Dockerfile with ssh:
-```bash
-FROM paddledev/paddle
-
-MAINTAINER PaddlePaddle dev team <paddle-dev@baidu.com>
-
-RUN apt-get update
-RUN apt-get install -y openssh-server
-RUN mkdir /var/run/sshd
-RUN echo 'root:root' | chpasswd
-
-RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
-
-EXPOSE 22
-
-CMD    ["/usr/sbin/sshd", "-D"]
-```
-
-Then you can build an image with Dockerfile and launch a container:
-
-```bash
-# cd into Dockerfile directory
-docker build . -t paddle_ssh
-# run container, and map host machine port 8022 to container port 22
-docker run -d -p 8022:22 --name paddle_ssh_machine paddle_ssh
-```
-Now, you can ssh on port 8022 to access the container, username is root, password is also root:
-
-```bash
-ssh -p 8022 root@YOUR_HOST_MACHINE
-```
-
-
-You can stop and delete the container as following:
-```bash
-# stop
-docker stop paddle_ssh_machine
-# delete
-docker rm paddle_ssh_machine
-```

doc/build/docker_install.rst

+Docker installation guide
+==========================
+
+PaddlePaddle provide the `Docker <https://www.docker.com/>`_ image. `Docker`_ is a lightweight container utilities. The performance of PaddlePaddle in `Docker`_ container is basically as same as run it in a normal linux. The `Docker`_ is a very convenient way to deliver the binary release for linux programs.
+
+..  note::
+
+    The `Docker`_ image is the recommended way to run PaddlePaddle 
+
+PaddlePaddle Docker images
+--------------------------
+
+There are 12 `images <https://hub.docker.com/r/paddledev/paddle/tags/>`_ for PaddlePaddle, and the name is :code:`paddle-dev/paddle`,  tags are\: 
+
+
++-----------------+------------------+------------------------+-----------------------+
+|                 |   normal         |           devel        |          demo         |
++=================+==================+========================+=======================+
+|       CPU       | cpu-latest       | cpu-devel-latest       | cpu-demo-latest       |
++-----------------+------------------+------------------------+-----------------------+
+|       GPU       | gpu-latest       | gpu-devel-latest       | gpu-demo-latest       |
++-----------------+------------------+------------------------+-----------------------+
+| CPU WITHOUT AVX | cpu-noavx-latest | cpu-devel-noavx-latest | cpu-demo-noavx-latest |
++-----------------+------------------+------------------------+-----------------------+
+| GPU WITHOUT AVX | gpu-noavx-latest | gpu-devel-noavx-latest | gpu-demo-noavx-latest |
++-----------------+------------------+------------------------+-----------------------+
+
+And the three columns are:
+
+* normal\: The docker image only contains binary of PaddlePaddle.
+* devel\: The docker image contains PaddlePaddle binary, source code and essential build environment.
+* demo\: The docker image contains the dependencies to run PaddlePaddle demo.
+
+And the four rows are:
+
+* CPU\: CPU Version. Support CPU which has :code:`AVX` instructions.
+* GPU\: GPU Version. Support GPU, and cpu has :code:`AVX` instructions.
+* CPU WITHOUT AVX\: CPU Version, which support most CPU even doesn't have :code:`AVX` instructions.
+* GPU WITHOUT AVX\: GPU Version, which support most CPU even doesn't have :code:`AVX` instructions.
+
+User can choose any version depends on machine. The following script can help you to detect your CPU support :code:`AVX` or not.
+
+..  code-block:: bash
+    
+    if cat /proc/cpuinfo | grep -q avx ; then echo "Support AVX"; else echo "Not support AVX"; fi
+
+If the output is :code:`Support AVX`, then you can choose the AVX version of PaddlePaddle, otherwise, you need select :code:`noavx` version of PaddlePaddle. For example, the CPU develop version of PaddlePaddle is :code:`paddle-dev/paddle:cpu-devel-latest`.
+
+The PaddlePaddle images don't contain any entry command. You need to write your entry command to use this image. See :code:`Remote Access` part or just use following command to run a :code:`bash`
+
+..  code-block:: bash
+
+    docker run -it paddledev/paddle:cpu-latest /bin/bash
+
+
+Download and Run Docker images
+------------------------------
+
+You have to install Docker in your machine which has linux kernel version 3.10+ first. You can refer to the official guide https://docs.docker.com/engine/installation/ for further information.
+
+You can use :code:`docker pull ` to download images first, or just launch a container with :code:`docker run` \:
+
+..  code-block:: bash
+
+    docker run -it paddledev/paddle:cpu-latest
+
+
+If you want to launch container with GPU support, you need to set some environment variables at the same time:
+
+..  code-block:: bash
+
+    export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}"
+    export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
+    docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddle:gpu-latest
+
+
+Some notes for docker
+---------------------
+
+Performance
++++++++++++
+
+Since Docker is based on the lightweight virtual containers, the CPU computing performance maintains well. And GPU driver and equipments are all mapped to the container, so the GPU computing performance would not be seriously affected.
+
+If you use high performance nic, such as RDMA(RoCE 40GbE or IB 56GbE), Ethernet(10GbE), it is recommended to use config "-net = host".
+
+
+
+
+Remote access
++++++++++++++
+
+
+If you want to enable ssh access background, you need to build an image by yourself. Please refer to official guide https://docs.docker.com/engine/reference/builder/ for further information.
+
+Following is a simple Dockerfile with ssh:
+
+..  literalinclude:: ../../doc_cn/build_and_install/install/paddle_ssh.Dockerfile
+
+Then you can build an image with Dockerfile and launch a container:
+
+..  code-block:: bash
+
+    # cd into Dockerfile directory
+    docker build . -t paddle_ssh
+    # run container, and map host machine port 8022 to container port 22
+    docker run -d -p 8022:22 --name paddle_ssh_machine paddle_ssh
+
+Now, you can ssh on port 8022 to access the container, username is root, password is also root:
+
+..  code-block:: bash
+
+    ssh -p 8022 root@YOUR_HOST_MACHINE
+
+You can stop and delete the container as following:
+
+..  code-block:: bash
+
+    # stop
+    docker stop paddle_ssh_machine
+    # delete
+    docker rm paddle_ssh_machine

doc/build/index.rst

@@ -10,31 +10,24 @@ Install PaddlePaddle
 
     install_*
     internal/install_from_jumbo.md
+    docker_install.rst
+    ubuntu_install.rst
 
 Build from Source
 -----------------
 
-If you want to hack and contribute PaddlePaddle source code, following guides can help you\:
-
-..  toctree::
-    :maxdepth: 1
-    :glob:
+..  warning::
 
-    build_from_source.md
-    contribute_to_paddle.md
+    Please use :code:`deb` package or :code:`docker` image to install paddle. The building guide is used for hacking or contributing to PaddlePaddle.
     
-Docker and Debian Package installation
---------------------------------------
 
-Note: The installation packages are still in pre-release 
-state and your experience of installation may not be smooth.
+If you want to hack and contribute PaddlePaddle source code, following guides can help you\:
 
-If you want to pack docker image, the following guide can help you\:
 
 ..  toctree::
     :maxdepth: 1
     :glob:
 
-    docker_install.md
-    ubuntu_install.md
+    build_from_source.md
+    contribute_to_paddle.md
 

doc/build/ubuntu_install.md

-Debian Package installation guide
-=================================
-
-## Debian Package installation
-Currently , PaddlePaddle only provides ubuntu14.04 debian packages.
-There are two versions package, including CPU and GPU. The download address is:
-
-https://github.com/baidu/Paddle/releases/tag/V0.8.0b0
-
-
-After downloading PaddlePaddle deb packages, you can run:
-
-```bash
-dpkg -i paddle-0.8.0b-cpu.deb
-apt-get install -f
-```
-And if you use GPU version deb package, you need to install CUDA toolkit and cuDNN, and set related environment variables(such as LD_LIBRARY_PATH) first. It is normal when `dpkg -i` get errors. `apt-get install -f` will continue install paddle, and install dependences. 
-
-**Note**
-
-PaddlePaddle package only supports x86 CPU with AVX instructions. If not, you have to download and build from source code.

doc/build/ubuntu_install.rst

+Debian Package installation guide
+=================================
+
+PaddlePaddle supports :code:`deb` pacakge. The installation of this :code:`deb` package is tested in ubuntu 14.04, but it should be support other debian based linux, too.
+
+There are four versions of debian package, :code:`cpu`, :code:`gpu`, :code:`cpu-noavx`, :code:`gpu-noavx`. And :code:`noavx` version is used to support CPU which does not contain :code:`AVX` instructions. The download url of :code:`deb` package is \: https://github.com/baidu/Paddle/releases/
+
+
+After downloading PaddlePaddle deb packages, you can use :code:`gdebi` install.
+
+..	code-block:: bash
+
+	gdebi paddle-*.deb
+
+If :code:`gdebi` is not installed, you can use :code:`sudo apt-get install gdebi` to install it.
+
+Or you can use following commands to install PaddlePaddle.
+
+..	code-block:: bash
+
+	dpkg -i paddle-*.deb
+	apt-get install -f
+
+And if you use GPU version deb package, you need to install CUDA toolkit and cuDNN, and set related environment variables(such as LD_LIBRARY_PATH) first. It is normal when `dpkg -i` get errors. `apt-get install -f` will continue install paddle, and install dependences. 
+

doc_cn/build_and_install/index.rst

 编译与安装
 ========================
 
+安装
+++++
+
 PaddlePaddle提供数个预编译的二进制来进行安装，包括Docker镜像，ubuntu的deb安装包等。我们推荐使用Docker镜像来部署环境，同时欢迎贡献更多的安装包。
 
-Note: The intallation packages are still in pre-release state and your experience of installation may not be smooth.
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   
+   使用Jumbo安装(对内) <../build/internal/install_from_jumbo.rst>
+   install/docker_install.rst 
+   install/ubuntu_install.rst
 
-注意：目前PaddlePaddle的安装包还处在pre-release的状态，使用起来或许会不是很顺畅。
+
+
+编译
+++++
+
+..  warning::
+
+	编译选项主要推荐高级用户查看，普通用户请走安装流程。
 
 .. toctree::
    :maxdepth: 1
    :glob:
 
    源码下载(对内) <../build/internal/download_paddle_source_zh_cn.rst>
-   使用Jumbo安装(对内) <../build/internal/install_from_jumbo.rst>
    从源码编译安装(对内)  <../build/internal/build_from_source_zh_cn.rst>
-   install/docker_install.rst 
-   install/ubuntu_install.rst
    cmake/index.rst

doc_cn/build_and_install/install/docker_install.rst

@@ -14,20 +14,43 @@ PaddlePaddle提供了Docker的使用镜像。PaddlePaddle推荐使用Docker进
 PaddlePaddle提供的Docker镜像版本
 --------------------------------
 
-我们提供了6个Docker image\:
+我们提供了12个 `Docker image <https://hub.docker.com/r/paddledev/paddle/tags/>`_ ，他们的image name都是 :code:`paddle-dev/paddle` ，tag分别为
 
-* paddledev/paddle\:cpu-latest\: PaddlePaddle的CPU二进制
-* paddledev/paddle\:gpu-latest\： PaddlePaddle的GPU二进制
-* paddledev/paddle\:cpu-devel-latest\: PaddlePaddle的CPU二进制,同时包含CPU开发环境和源码
-* paddledev/paddle\:gpu-devel-latest\: PaddlePaddle的GPU二进制,同时包含GPU开发环境和源码
-* paddledev/paddle\:cpu-demo-latest\: PaddlePaddle的CPU二进制,同时包含CPU开发环境、源码和运行demo的必要依赖
-* paddledev/paddle\:gpu-demo-latest\: PaddlePaddle的GPU二进制,同时包含GPU开发环境、源码和运行demo的必要依赖
++-----------------+------------------+------------------------+-----------------------+
+|                 |   normal         |           devel        |          demo         |
++=================+==================+========================+=======================+
+|       CPU       | cpu-latest       | cpu-devel-latest       | cpu-demo-latest       |
++-----------------+------------------+------------------------+-----------------------+
+|       GPU       | gpu-latest       | gpu-devel-latest       | gpu-demo-latest       |
++-----------------+------------------+------------------------+-----------------------+
+| CPU WITHOUT AVX | cpu-noavx-latest | cpu-devel-noavx-latest | cpu-demo-noavx-latest |
++-----------------+------------------+------------------------+-----------------------+
+| GPU WITHOUT AVX | gpu-noavx-latest | gpu-devel-noavx-latest | gpu-demo-noavx-latest |
++-----------------+------------------+------------------------+-----------------------+
 
-同时，不同的稳定版本，会将latest替换成稳定版本的版本号。
+其中，横向包括三个版本，normal，devel和demo。
+
+* Normal: 正常的Docker image，只包括paddle的二进制
+* Devel: 包括Paddle的二进制、编译环境和源代码
+* Demo: 包括Paddle运行demo所需要的依赖
+
+纵向包括四个版本，他们是。
+
+* CPU: CPU版本。需要支持AVX指令集的CPU
+* GPU: GPU版本。需要支持AVX指令集的CPU
+* CPU WITHOUT AVX: CPU版本，不支持AVX指令集的CPU也可以运行
+* GPU WITHOUT AVX: GPU版本，不需要AVX指令集的CPU也可以运行。
+
+用户可以选择对应版本的docker image。使用如下脚本可以确定本机的CPU知否支持 :code:`AVX` 指令集\:
+
+..  code-block:: bash
+
+    if cat /proc/cpuinfo | grep -q avx ; then echo "Support AVX"; else echo "Not support AVX"; fi
+
+如果输出 :code:`Support AVX`，则可以选择上表中的AVX版本PaddlePaddle。否则需要选择非AVX的PaddlePaddle。选择普通CPU版本的devel版本的image，则可以使用 :code:`paddle-dev/paddle:cpu-devel-latest` 来引用这个image。
 
 PaddlePaddle提供的镜像并不包含任何命令运行，想要运行PaddlePaddle，您需要进入镜像运行PaddlePaddle
-程序或者自定义一个含有启动脚本的image。具体请参考注意事项中的 
-`使用ssh访问PaddlePaddle镜像`
+程序或者自定义一个含有启动脚本的image。具体请参考注意事项中的 :code:`使用ssh访问PaddlePaddle镜像`
 
 下载和运行Docker镜像
 --------------------
@@ -44,7 +67,7 @@ mac osx或者是windows机器，请参考
 
 ..  code-block:: bash
     
-    $ docker run -it paddledev/paddlepaddle:latest-cpu
+    $ docker run -it paddledev/paddlepaddle:cpu-latest
 
 即可启动和进入PaddlePaddle的container。如果运行GPU版本的PaddlePaddle，则需要先将
 cuda相关的Driver和设备映射进container中，脚本类似于
@@ -53,7 +76,7 @@ cuda相关的Driver和设备映射进container中，脚本类似于
 
     $ export CUDA_SO="$(\ls /usr/lib64/libcuda* | xargs -I{} echo '-v {}:{}') $(\ls /usr/lib64/libnvidia* | xargs -I{} echo '-v {}:{}')"
     $ export DEVICES=$(\ls /dev/nvidia* | xargs -I{} echo '--device {}:{}')
-    $ docker run -it paddledev/paddlepaddle:latest-gpu
+    $ docker run ${CUDA_SO} ${DEVICES} -it paddledev/paddlepaddle:latest-gpu
 
 进入Docker container后，运行 :code:`paddle version` 即可打印出PaddlePaddle的版本和构建
 信息。安装完成的PaddlePaddle主体包括三个部分， :code:`paddle` 脚本， python的

doc_cn/build_and_install/install/paddle_version.txt

+PaddlePaddle 0.8.0b1, compiled with
+    with_avx: ON
+    with_gpu: OFF
+    with_double: OFF
+    with_python: ON
+    with_rdma: OFF
+    with_glog: ON
+    with_gflags: ON
+    with_metric_learning:
+    with_timer: OFF
+    with_predict_sdk:
\ No newline at end of file

doc_cn/build_and_install/install/ubuntu_install.rst

 使用deb包在Ubuntu上安装PaddlePaddle
 ===================================
 
-PaddlePaddle目前支持ubuntu 14.04版本使用deb包安装。更多的安装包PaddlePaddle会在近期提供。
-欢迎大家贡献各个发行版的安装包(例如，ubuntu，centos，debian，gentoo)。
+PaddlePaddle目前支持使用deb包安装。Paddle的 :code:`deb` 安装包在ubuntu 14.04中正确，但理论上支持其他的 debian 发行版。
 
-PaddlePaddle的ubuntu安装包分为两个版本，即CPU版本，和GPU版本，他们的下载地址是\:
-https://github.com/baidu/Paddle/releases/tag/V0.8.0b0
 
-需要注意的是，目前PaddlePaddle的安装包只支持 
-`AVX <https://en.wikipedia.org/wiki/Advanced_Vector_Extensions>`_
-指令集的X86 CPU。如果系统使用不支持 `AVX`_ 指令集的CPU运行PaddlePaddle，那么需要从源码
-编译PaddlePaddle，请参考 `编译文档 <../cmake/index.html>`_ 。
+PaddlePaddle的ubuntu安装包分为四个版本，他们是 cpu、gpu、cpu-noavx、gpu-noavx 四个版本。其中 noavx 用于不支持AVX指令集的cpu。安装包的下载地址是\: https://github.com/baidu/Paddle/releases/
 
-用户需要先将PaddlePaddle安装包下载到本地，然后执行如下命令即可完成安装。
+
+用户需要先将PaddlePaddle安装包下载到本地，然后执行如下 :code:`gdebi` 命令即可完成安装。
 
 ..  code-block:: shell
 
-    dpkg -i paddle-*-cpu.deb
-    apt-get install -f
+    gdebi paddle-*-cpu.deb
+
+如果 :code:`gdebi` 没有安装,则需要使用 :code:`sudo apt-get install gdebi`, 来安装 :code:`gdebi` 。
 
-在 :code:`dpkg -i` 的时候如果报一些依赖未找到的错误是正常的，
-在 :code:`apt-get install -f` 里会继续安装 PaddlePaddle。
 
 或者使用下面一条命令安装.
 
 ..  code-block:: shell
 
-    gdebi paddle-*-cpu.deb
-
-如果 :code:`gdebi` 没有安装,则需要使用 :code:`sudo apt-get install gdebi`, 来安装 :code:`gdebi`
+    dpkg -i paddle-*-cpu.deb
+    apt-get install -f
 
+在 :code:`dpkg -i` 的时候如果报一些依赖未找到的错误是正常的，
+在 :code:`apt-get install -f` 里会继续安装 PaddlePaddle。
 
 需要注意的是，如果使用GPU版本的PaddlePaddle，请安装CUDA 7.5 和CUDNN 5到本地环境中，
 并设置好对应的环境变量(LD_LIBRARY_PATH等等)。
 
 安装完成后,可以使用命令 :code:`paddle version` 查看安装后的paddle 版本。可能的输出为
 
-..  code-block:: text
-
-    PaddlePaddle 0.8.0b1, compiled with
-    with_avx: ON
-    with_gpu: OFF
-    with_double: OFF
-    with_python: ON
-    with_rdma: OFF
-    with_glog: ON
-    with_gflags: ON
-    with_metric_learning:
-    with_timer: OFF
-    with_predict_sdk:
-
+..  literalinclude:: paddle_version.txt
 
 可能遇到的问题
 --------------