diff --git a/doc/_sources/build/build_from_source.txt b/doc/_sources/build/build_from_source.txt
index f7db0a9b92e67e1ecf5e44f1edb17cb8cacd8d2d..c671f483863c7466a13fac3943e8d58eb74866fc 100644
--- a/doc/_sources/build/build_from_source.txt
+++ b/doc/_sources/build/build_from_source.txt
@@ -1,5 +1,5 @@
Installing from Sources
-==========================
+=================
* [1. Download and Setup](#download)
* [2. Requirements](#requirements)
@@ -28,26 +28,51 @@ To compile the source code, your computer must be equipped with GCC >=4.6 or Cla
PaddlePaddle supports some build options. To enable it, first you need to install the related libraries.
-
-
-
-
-
Optional
-
Description
-
-
-
-
WITH_GPU
Compile with GPU mode.
-
WITH_DOUBLE
Compile with double precision floating-point, default: single precision.
-
WITH_GLOG
Compile with glog. If not found, default: an internal log implementation.
-
WITH_GFLAGS
Compile with gflags. If not found, default: an internal flag implementation.
-
WITH_TESTING
Compile with gtest for PaddlePaddle's unit testing.
-
WITH_DOC
Compile to generate PaddlePaddle's docs, default: disabled (OFF).
-
WITH_SWIG_PY
Compile with python predict API, default: disabled (OFF).
-
WITH_STYLE_CHECK
Compile with code style check, default: enabled (ON).
-
+
+
+
+
Optional
+
Description
+
+
+
WITH_GPU
+
Compile with GPU mode.
+
+
+
WITH_DOUBLE
+
Compile with double precision floating-point, default: single precision.
+
+
+
WITH_GLOG
+
Compile with glog. If not found, default: an internal log implementation.
+
+
+
WITH_GFLAGS
+
Compile with gflags. If not found, default: an internal flag implementation.
+
+
+
WITH_TESTING
+
Compile with gtest for PaddlePaddle's unit testing.
+
+
+
WITH_DOC
+
Compile to generate PaddlePaddle's docs, default: disabled (OFF)
+
+
+
WITH_SWIG_PY
+
Compile with python predict API, default: disabled (OFF).
+
+
+
WITH_STYLE_CHECK
+
Compile with code style check, default: enabled (ON).
+
-
**Note:**
- The GPU version works best with Cuda Toolkit 7.5 and cuDNN v5.
@@ -309,4 +334,4 @@ It may require sudo privileges:
sudo pip install /opt/paddle/share/wheels/*.whl
# or just run
sudo paddle version
-```
+```
\ No newline at end of file
diff --git a/doc/_sources/build/contribute_to_paddle.txt b/doc/_sources/build/contribute_to_paddle.txt
index bbdbb4d4227d0b5b8ada00baec7182cedcada861..06fcff61720755432c5618500ac509c5b3f867df 100644
--- a/doc/_sources/build/contribute_to_paddle.txt
+++ b/doc/_sources/build/contribute_to_paddle.txt
@@ -99,7 +99,3 @@ git pull --rebase upstream HEAD
git push -f origin HEAD
```
Now your Pull Request is updated with the latest version.
-
-## Revise your pull request
-
-When you revise your pull request according to reviewer's comments, please use 'git commit' instead of 'git commit --amend' to commit your changes so that the reviewers can see the difference between the new pull requrest and the old pull request.
diff --git a/doc/_sources/build/docker_install.txt b/doc/_sources/build/docker_install.txt
index e95de35f4da35fee511551f13bc6026532cce5c3..3cd9d1730a22b97c208233ad4c6f9bad8038c1bf 100644
--- a/doc/_sources/build/docker_install.txt
+++ b/doc/_sources/build/docker_install.txt
@@ -1,84 +1,42 @@
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
-PaddlePaddle provide the `Docker `_ 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.
+Docker is a tool designed to make it easier to create, deploy, and run applications by using containers.
-.. note::
+### PaddlePaddle Docker images
+There are six Docker images:
- The `Docker`_ image is the recommended way to run PaddlePaddle
+- 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
-PaddlePaddle Docker images
---------------------------
+Tags with latest will be replaced by a released version.
-There are 12 `images `_ 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
-------------------------------
+### 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
-
+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:
-.. 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
+```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
-Some notes for docker
----------------------
-
-Performance
-+++++++++++
+#### 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.
@@ -87,36 +45,47 @@ If you use high performance nic, such as RDMA(RoCE 40GbE or IB 56GbE), Ethernet(
-Remote access
-+++++++++++++
-
-
+#### 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
-.. literalinclude:: ../../doc_cn/build_and_install/install/paddle_ssh.Dockerfile
+MAINTAINER PaddlePaddle dev team
-Then you can build an image with Dockerfile and launch a container:
+RUN apt-get update
+RUN apt-get install -y openssh-server
+RUN mkdir /var/run/sshd
+RUN echo 'root:root' | chpasswd
-.. code-block:: bash
+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
- # 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
+EXPOSE 22
-Now, you can ssh on port 8022 to access the container, username is root, password is also root:
+CMD ["/usr/sbin/sshd", "-D"]
+```
-.. code-block:: bash
+Then you can build an image with Dockerfile and launch a container:
- ssh -p 8022 root@YOUR_HOST_MACHINE
+```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:
-You can stop and delete the container as following:
+```bash
+ssh -p 8022 root@YOUR_HOST_MACHINE
+```
-.. code-block:: bash
- # stop
- docker stop paddle_ssh_machine
- # delete
- docker rm paddle_ssh_machine
+You can stop and delete the container as following:
+```bash
+# stop
+docker stop paddle_ssh_machine
+# delete
+docker rm paddle_ssh_machine
+```
diff --git a/doc/_sources/build/index.txt b/doc/_sources/build/index.txt
index 511cdea145c7fd0e41566d0a85115dbb06f84058..d6d0d19e110fc35faec87da90d784a6775b9c91f 100644
--- a/doc/_sources/build/index.txt
+++ b/doc/_sources/build/index.txt
@@ -10,20 +10,12 @@ Install PaddlePaddle
install_*
internal/install_from_jumbo.md
- docker_install.rst
- ubuntu_install.rst
Build from Source
-----------------
-.. warning::
-
- Please use :code:`deb` package or :code:`docker` image to install paddle. The building guide is used for hacking or contributing to PaddlePaddle.
-
-
If you want to hack and contribute PaddlePaddle source code, following guides can help you\:
-
.. toctree::
:maxdepth: 1
:glob:
@@ -31,3 +23,18 @@ If you want to hack and contribute PaddlePaddle source code, following guides ca
build_from_source.md
contribute_to_paddle.md
+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 pack docker image, the following guide can help you\:
+
+.. toctree::
+ :maxdepth: 1
+ :glob:
+
+ docker_install.md
+ ubuntu_install.md
+
diff --git a/doc/_sources/build/ubuntu_install.txt b/doc/_sources/build/ubuntu_install.txt
index ea8042085bf458be96e71017d229d88ad867695b..c30a8f6db5d9eb83390d9374d27aba46fa42a462 100644
--- a/doc/_sources/build/ubuntu_install.txt
+++ b/doc/_sources/build/ubuntu_install.txt
@@ -1,25 +1,21 @@
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.
+## Debian Package installation
+Currently , PaddlePaddle only provides ubuntu14.04 debian packages.
+There are two versions package, including CPU and GPU. The download address is:
-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/
+https://github.com/baidu/Paddle/releases/tag/V0.8.0b0
-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
+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.
diff --git a/doc/_sources/demo/quick_start/index_en.txt b/doc/_sources/demo/quick_start/index_en.txt
index e7d74512292c89233373c48d05895794d56702d8..ee3fa2a2166f497524663574270b239a6170ab19 100644
--- a/doc/_sources/demo/quick_start/index_en.txt
+++ b/doc/_sources/demo/quick_start/index_en.txt
@@ -134,7 +134,7 @@ def process(settings, file_name):
You need to add a data provider definition `define_py_data_sources2` in our network configuration. This definition specifies:
- The path of the training and testing data (`data/train.list`, `data/test.list`).
-- The location of the data provider file (`dataprovider_bow`).
+- The location of the data provider file (`dataprovider_pow`).
- The function to call to get data. (`process`).
- Additional arguments or data. Here it passes the path of word dictionary.
diff --git a/doc/_sources/ui/api/trainer_config_helpers/layers.txt b/doc/_sources/ui/api/trainer_config_helpers/layers.txt
index 5bb88b0615c12a44e1506e0bdbb974c16f5584ea..c1d7a7ce815301be7d4193560fc6c27d90cf6e69 100644
--- a/doc/_sources/ui/api/trainer_config_helpers/layers.txt
+++ b/doc/_sources/ui/api/trainer_config_helpers/layers.txt
@@ -73,12 +73,6 @@ img_pool_layer
:members: img_pool_layer
:noindex:
-maxout_layer
-------------
-.. automodule:: paddle.trainer_config_helpers.layers
- :members: maxout_layer
- :noindex:
-
Norm Layer
==========
@@ -136,12 +130,6 @@ gru_step_layer
Recurrent Layer Group
=====================
-memory
-------
-.. automodule:: paddle.trainer_config_helpers.layers
- :members: memory
- :noindex:
-
recurrent_group
---------------
.. automodule:: paddle.trainer_config_helpers.layers
@@ -383,12 +371,6 @@ ctc_layer
:members: ctc_layer
:noindex:
-nce_layer
------------
-.. automodule:: paddle.trainer_config_helpers.layers
- :members: nce_layer
- :noindex:
-
hsigmoid
---------
.. automodule:: paddle.trainer_config_helpers.layers
diff --git a/doc/build/build_from_source.html b/doc/build/build_from_source.html
index 6c23f5a3dcb640ab4de08276764b00bcec618202..66ac23d7155f6a3f7d72e1ec1c35aac5778e72ce 100644
--- a/doc/build/build_from_source.html
+++ b/doc/build/build_from_source.html
@@ -31,7 +31,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-