Merge branch 'develop' of https://github.com/baidu/Paddle into config_parse_bug_fix

README.md

@@ -88,10 +88,8 @@ Both [English Docs](http://paddlepaddle.org/doc/) and [Chinese Docs](http://padd
 - [Source Code Documents](http://paddlepaddle.org/doc/source/) <br>
 
 ## Ask Questions
-Please join the [**gitter chat**](https://gitter.im/PaddlePaddle/Deep_Learning) or send email to
-**paddle-dev@baidu.com** to ask questions and talk about methods and models.
-Framework development discussions and
-bug reports are collected on [Issues](https://github.com/baidu/paddle/issues).
+
+You are welcome to submit questions and bug reports as [Github Issues](https://github.com/baidu/paddle/issues).
 
 ## Copyright and License
 PaddlePaddle is provided under the [Apache-2.0 license](LICENSE).

doc/source/api/api.rst → doc/source/api.rst

 API
-========
+===
 
 .. doxygenfile:: paddle/api/PaddleAPI.h
 .. doxygenfile:: paddle/api/Internal.h

doc/source/cuda/cuda/index.rst

-CUDA
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  cuda.rst

doc/source/cuda/matrix/index.rst → doc/source/cuda/index.rst

-Matrix
-====================
+CUDA
+====
 
 .. toctree::
-  :maxdepth: 3
+  :maxdepth: 2
 
   matrix.rst
+  nn.rst
+  utils.rst

doc/source/cuda/matrix/matrix.rst → doc/source/cuda/matrix.rst

 Matrix
-=======
+======
 
-Base Matrix
--------------
+Base
+----
 
 hl_matrix.h
-``````````````````
+```````````
 .. doxygenfile:: paddle/cuda/include/hl_matrix.h
 
 hl_matrix_base.h
-``````````````````
+````````````````
 .. doxygenfile:: paddle/cuda/include/hl_matrix_base.cuh
 
 hl_matrix_apply.cuh
-``````````````````````
+```````````````````
 .. doxygenfile:: paddle/cuda/include/hl_matrix_apply.cuh
 
 hl_matrix_ops.cuh
-``````````````````````
+`````````````````
 .. doxygenfile:: paddle/cuda/include/hl_matrix_ops.cuh
 
 hl_matrix_type.cuh
-``````````````````````
+``````````````````
 .. doxygenfile:: paddle/cuda/include/hl_matrix_type.cuh
 
 hl_sse_matrix_kernel.cuh
-``````````````````````````
+````````````````````````
 .. doxygenfile:: paddle/cuda/include/hl_sse_matrix_kernel.cuh
 
+Matrix Function 
+---------------
+
 hl_batch_transpose.h
-``````````````````````````
+````````````````````
 .. doxygenfile:: paddle/cuda/include/hl_batch_transpose.h
 
-Sparse Matrix
---------------
-
-hl_sparse.h
-``````````````````
-.. doxygenfile:: paddle/cuda/include/hl_sparse.h
-
-hl_sparse.ph
-``````````````````````
-.. doxygenfile:: paddle/cuda/include/hl_sparse.ph
-
-Others
----------------
-
 hl_aggregate.h
-``````````````````
+``````````````
 .. doxygenfile:: paddle/cuda/include/hl_aggregate.h
 
+hl_top_k.h
+``````````
+.. doxygenfile:: paddle/cuda/include/hl_top_k.h
+
 hl_table_apply.h
-``````````````````
+````````````````
 .. doxygenfile:: paddle/cuda/include/hl_table_apply.h
 
-hl_top_k.h
-``````````````````
-.. doxygenfile:: paddle/cuda/include/hl_top_k.h
+Sparse Matrix
+-------------
 
+hl_sparse.h
+```````````
+.. doxygenfile:: paddle/cuda/include/hl_sparse.h
 
+hl_sparse.ph
+````````````
+.. doxygenfile:: paddle/cuda/include/hl_sparse.ph

doc/source/cuda/rnn/rnn.rst → doc/source/cuda/nn.rst

-Neural Networks
-==================
+Neural Network
+==============
 
 Base
--------
+----
+
 .. doxygenfile:: paddle/cuda/include/hl_gpu.h
-.. doxygenfile:: paddle/cuda/include/hl_cnn.h
 .. doxygenfile:: paddle/cuda/include/hl_functions.h
 .. doxygenfile:: paddle/cuda/include/hl_avx_functions.h
-.. doxygenfile:: paddle/cuda/include/hl_device_functions.cuh
 .. doxygenfile:: paddle/cuda/include/hl_gpu_functions.cuh
-
-Activation Functions
------------------------
 .. doxygenfile:: paddle/cuda/include/hl_activation_functions.h
 
+
+CNN Related APIs
+----------------
+.. doxygenfile:: paddle/cuda/include/hl_cnn.h
+.. doxygenfile:: paddle/cuda/include/hl_cuda_cudnn.h
+.. doxygenfile:: paddle/cuda/include/hl_cuda_cudnn.ph
+
 RNN Related APIs
------------------
+----------------
 
 .. doxygenfile:: paddle/cuda/include/hl_recurrent_apply.cuh
 .. doxygenfile:: paddle/cuda/include/hl_sequence.h
 
 LSTM Model
-``````````````
+``````````
+
 .. doxygenfile:: paddle/cuda/include/hl_lstm.h
 .. dpxygenfile:: paddle/cuda/include/hl_cpu_lstm.cuh
 .. doxygenfile:: paddle/cuda/include/hl_gpu_lstm.cuh
 .. doxygenfile:: paddle/cuda/include/hl_lstm_ops.cuh
 
 GRU Model
-````````````````
+`````````
+
 .. doxygenfile:: paddle/cuda/include/hl_gru_ops.cuh
 .. doxygenfile:: paddle/cuda/include/hl_cpu_gru.cuh
 .. doxygenfile:: paddle/cuda/include/hl_gpu_gru.cuh
-
-

doc/source/cuda/rnn/index.rst

-RNN
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  rnn.rst

doc/source/cuda/cuda/cuda.rst → doc/source/cuda/utils.rst

-Cuda
-=============
+Utils
+=====
 
 Dynamic Link Libs
---------------------------
-
-hl_dso_loader.h
-``````````````````
+-----------------
 .. doxygenfile:: paddle/cuda/include/hl_dso_loader.h
 
 GPU Resources
-----------------
+-------------
 
 hl_cuda.ph
-``````````````
+``````````
 .. doxygenfile:: paddle/cuda/include/hl_cuda.ph
 
 hl_cuda.h
-``````````````
+`````````
 .. doxygenfile:: paddle/cuda/include/hl_cuda.h
 
-CUDA Wrapper
---------------
+HPPL Base
+---------
+.. doxygenfile:: paddle/cuda/include/hl_base.h
 
-hl_cuda_cublas.h
-``````````````````````
+CUBLAS Wrapper
+--------------
 .. doxygenfile:: paddle/cuda/include/hl_cuda_cublas.h
 
-hl_cuda_cudnn.h
-``````````````````````
-.. doxygenfile:: paddle/cuda/include/hl_cuda_cudnn.h
-
-hl_cuda_cudnn.h
-``````````````````````
-.. doxygenfile:: paddle/cuda/include/hl_cuda_cudnn.ph
-
-
+Timer
+-----
+.. doxygenfile:: paddle/cuda/include/hl_time.h
 
+Thread Resource
+---------------
+.. doxygenfile:: paddle/cuda/include/hl_thread.ph
 
+Device Function
+---------------
+.. doxygenfile:: paddle/cuda/include/hl_device_functions.cuh

doc/source/cuda/utils/index.rst

-Utils
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  utils.rst

doc/source/cuda/utils/utils.rst

-Utilities
-===========
-
-HPPL Base
-------------
-
-hl_base.h
-``````````````
-.. doxygenfile:: paddle/cuda/include/hl_base.h
-
-Timer
------------
-
-hl_time.h
-``````````````
-.. doxygenfile:: paddle/cuda/include/hl_time.h
-
-Thread Resource
------------
-
-hl_thread.ph
-``````````````
-.. doxygenfile:: paddle/cuda/include/hl_thread.ph

doc/source/gserver/activations/index.rst → doc/source/gserver/activations.rst

 Activations
-=============
+===========
 
 ..  doxygenclass:: paddle::ActivationFunction
     :members:

doc/source/gserver/dataprovider/index.rst

-Data Providers Documents
-==========================
-
-.. toctree::
-  :maxdepth: 3
-
-  dataproviders.rst

doc/source/gserver/dataprovider/dataproviders.rst → doc/source/gserver/dataproviders.rst

+==============
 Data Providers
-================
+==============
 
-Base DataProvider
-------------------
+DataProviders
+=============
+
+Base
+----
 ..  doxygenclass:: paddle::DataProvider
     :members:
 
 DataProviderGroup
--------------------
+-----------------
 ..  doxygenclass:: paddle::DataProviderGroup
     :members:
 
 MultiDataProvider
--------------------
+-----------------
 ..  doxygenclass:: paddle::MultiDataProvider
     :members:
 
 PyDataProvider
-===================
+==============
 
 IFieldScanner
 -------------
@@ -45,7 +49,7 @@ SparseValueScanner
     :members:
 
 SequenceScanner
-------------------
+---------------
 ..  doxygenclass:: paddle::SparseValueScanner
     :members:
 
@@ -69,8 +73,8 @@ IPyDataProvider
 ..  doxygenclass:: paddle::PyDataProvider2
     :members:
 
-Proto Data Provider
-===================
+ProtoDataProvider
+=================
 
 ProtoDataProvider
 ----------------
@@ -78,6 +82,6 @@ ProtoDataProvider
     :members:
 
 ProtoSequenceDataProvider
-----------------
+-------------------------
 ..  doxygenclass:: paddle::ProtoSequenceDataProvider
     :members:

doc/source/gserver/evaluators/evaluators.rst → doc/source/gserver/evaluators.rst

-Base Evaluator
-==============
+==========
+Evaluators
+==========
+
+Base
+====
 
-Evaluator
----------
 ..  doxygenclass:: paddle::Evaluator
     :members:
 
-
-Utils
-=====
+Sum
+===
 
 SumEvaluator
 ------------

doc/source/gserver/evaluators/index.rst

-Evaluators
-==========
-
-.. toctree::
-  :maxdepth: 3
-
-  evaluators.rst

doc/source/gserver/gradientmachines/gradientmachines.rst → doc/source/gserver/gradientmachines.rst

 Gradient Machines
-================
+=================
 
 GradientMachine
----------------------
+---------------
 ..  doxygenclass:: paddle::GradientMachine
     :members:
 
-GradientMachineModel
---------------------
+GradientMachineMode
+-------------------
 ..  doxygenclass:: paddle::IGradientMachineMode
     :members:
 
 MultiGradientMachine
----------------------
+--------------------
 ..  doxygenclass:: paddle::MultiGradientMachine
     :members:
 
@@ -21,20 +21,7 @@ TrainerThread
 ..  doxygenclass:: paddle::TrainerThread
     :members:
 
-Recurrent Gradient Machines
----------------------------
+RecurrentGradientMachine
+------------------------
 ..  doxygenclass:: paddle::RecurrentGradientMachine
     :members:
-
-Networks
-========
-
-NeuralNetwork
--------------
-..  doxygenclass:: paddle::NeuralNetwork
-    :members:
-
-ParallelNeuralNetwork
----------------------
-..  doxygenclass:: paddle::ParallelNeuralNetwork
-    :members:

doc/source/gserver/gradientmachines/index.rst

-Gradient Machines Documents
-=============================
-
-.. toctree::
-  :maxdepth: 3
-
-  gradientmachines.rst

doc/source/gserver/index.rst

+GServer
+=======
+
+.. toctree::
+  :maxdepth: 2
+
+  activations.rst
+  dataproviders.rst
+  evaluators.rst
+  gradientmachines.rst
+  layers.rst
+  neworks.rst

doc/source/gserver/layers/layer.rst → doc/source/gserver/layers.rst

-Base
+======
+Layers
 ======
 
+Base
+====
+
 Layer 
 -----
 ..  doxygenclass:: paddle::Layer
@@ -17,7 +21,7 @@ Operator
     :members:
     
 Data Layer
-===========
+==========
 
 ..  doxygenclass:: paddle::DataLayer
     :members:
@@ -58,6 +62,11 @@ CudnnConvLayer
 ..  doxygenclass:: paddle::CudnnConvLayer
     :members:
 
+ExpandConvBaseLayer
+-------------------
+..  doxygenclass:: paddle::ExpandConvBaseLayer
+    :members:
+
 ExpandConvLayer
 ---------------
 ..  doxygenclass:: paddle::ExpandConvLayer
@@ -86,6 +95,16 @@ CudnnPoolLayer
 ..  doxygenclass:: paddle::CudnnPoolLayer
     :members:
 
+SpatialPyramidPoolLayer
+-----------------------
+..  doxygenclass:: paddle::SpatialPyramidPoolLayer
+    :members:
+
+MaxOutLayer
+-----------
+..  doxygenclass:: paddle::MaxOutLayer
+    :members:
+
 Norm Layers
 ===========
 
@@ -402,6 +421,11 @@ TransLayer
 Sampling Layers
 ===============
 
+BilinearInterpLayer
+-------------------
+..  doxygenclass:: paddle::BilinearInterpLayer
+    :members:
+
 MultinomialSampler
 ------------------
 ..  doxygenclass:: paddle::MultinomialSampler

doc/source/gserver/layers/index.rst

-Layers Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  layer.rst

doc/source/gserver/neworks.rst

+Networks
+========
+
+NeuralNetwork
+-------------
+..  doxygenclass:: paddle::NeuralNetwork
+    :members:
+
+ParallelNeuralNetwork
+---------------------
+..  doxygenclass:: paddle::ParallelNeuralNetwork
+    :members:

doc/source/index.md

-# Source Code Documents
-
-## cuda
-
-- [CUDA](cuda/cuda/index.rst)
-- [Matrix](cuda/matrix/index.rst)
-- [RNN](cuda/rnn/index.rst)
-- [Utils](cuda/utils/index.rst)
-
-## gserver
-
-- [Activations](gserver/activations/index.rst)
-- [Data Providers](gserver/dataprovider/index.rst)
-- [Evaluators](gserver/evaluators/index.rst)
-- [Gradient Machines](gserver/gradientmachines/index.rst)
-- [Layers](gserver/layers/index.rst)
-
-## math
-
-- [Matrix](math/matrix/index.rst)
-- [Utils](math/utils/index.rst)
-
-## parameter
-
-- [Parameter](parameter/parameter/index.rst)
-- [Update](parameter/update/index.rst)
-- [Optimizer](parameter/optimizer/index.rst)
-
-## pserver
-
-- [Client](pserver/client/index.rst)
-- [Network](pserver/network/index.rst)
-- [Server](pserver/server/index.rst)
-
-## trainer
-
-- [Trainer](trainer/trainer.rst)
-
-## api
-
-- [API](api/api.rst)
-
-## utils
-
-- [CustomStackTrace](utils/customStackTrace.rst)
-- [Enumeration wrapper](utils/enum.rst)
-- [Lock](utils/lock.rst)
-- [Queue](utils/queue.rst)
-- [Thread](utils/thread.rst)

doc/source/index.rst

+Source Code Documents
+=====================
+
+.. toctree::
+  :maxdepth: 1
+
+  gserver/index.rst
+  trainer.rst
+  parameter/index.rst
+  pserver/index.rst
+  api.rst
+  cuda/index.rst
+  math/index.rst
+  utils/index.rst

doc/source/math/functions.rst

+Functions
+=========
+
+MathFunctions
+-------------
+.. doxygenfile:: paddle/math/MathFunctions.h
+
+SIMDFunctions
+-------------
+.. doxygenfile:: paddle/math/SIMDFunctions.h

doc/source/math/index.rst

+Math
+====
+
+.. toctree::
+  :maxdepth: 2
+
+  vector.rst
+  matrix.rst
+  functions.rst
+  utils.rst

doc/source/math/matrix.rst

+Matrix
+======
+
+Base
+----
+
+BaseMatrix Template
+```````````````````
+..  doxygenclass:: paddle::BaseMatrixT
+    :members:
+
+Matrix
+``````
+..  doxygenclass:: paddle::Matrix
+    :members:
+
+MatrixOffset
+````````````
+..  doxygenclass:: paddle::MatrixOffset
+    :members:
+
+CpuMatrix
+---------
+
+CpuMatrix
+`````````
+..  doxygenclass:: paddle::CpuMatrix
+    :members:
+
+SharedCpuMatrix
+```````````````
+..  doxygenclass:: paddle::SharedCpuMatrix
+    :members:
+
+GpuMatrix
+---------
+..  doxygenclass:: paddle::GpuMatrix
+    :members:
+
+CpuSparseMatrix
+---------------
+
+CpuSparseMatrix
+```````````````
+..  doxygenclass:: paddle::CpuSparseMatrix
+    :members:
+
+SparseRowCpuMatrix
+``````````````````
+..  doxygenclass:: paddle::SparseRowCpuMatrix
+    :members:
+
+SparseAutoGrowRowCpuMatrix
+``````````````````````````
+..  doxygenclass:: paddle::SparseAutoGrowRowCpuMatrix
+    :members:
+
+SparsePrefetchRowCpuMatrix
+``````````````````````````
+..  doxygenclass:: paddle::SparsePrefetchRowCpuMatrix
+    :members:
+
+SparseRowIdsCpuMatrix
+`````````````````````
+..  doxygenclass:: paddle::SparseRowIdsCpuMatrix
+    :members:
+
+CacheRowCpuMatrix
+`````````````````
+..  doxygenclass:: paddle::CacheRowCpuMatrix
+    :members:
+
+GpuSparseMatrix
+---------------
+..  doxygenclass:: paddle::GpuSparseMatrix
+    :members:

doc/source/math/matrix/index.rst

-Matrix Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  matrix.rst

doc/source/math/matrix/matrix.rst

-Matrix
-=======
-
-Base
---------
-.. doxygenfile:: paddle/math/BaseMatrix.h
-
-Sparse Matrix
-----------------
-.. doxygenfile:: paddle/math/Matrix.h
-.. doxygenfile:: paddle/math/Vector.h
-.. doxygenfile:: paddle/math/MathUtils.h
-.. doxygenfile:: paddle/math/SparseMatrix.h
-.. doxygenfile:: paddle/math/SparseRowMatrix.h
-.. doxygenfile:: paddle/math/CpuSparseMatrix.h
-
-Others
-----------
-.. doxygenfile:: paddle/math/MathFunctions.h
-.. doxygenfile:: paddle/math/SIMDFunctions.h

doc/source/math/utils/utils.rst → doc/source/math/utils.rst

-Utils
-=======
+Memory Manager
+==============
 
 Memory Handle
---------------
+-------------
 .. doxygenfile:: paddle/math/MemoryHandle.h
+
+Allocator
+---------
 .. doxygenfile:: paddle/math/Allocator.h
+
+PoolAllocator
+`````````````
 .. doxygenfile:: paddle/math/PoolAllocator.h
+
+Storage
+-------
 .. doxygenfile:: paddle/math/Storage.h

doc/source/math/utils/index.rst

-Utils Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  utils.rst

doc/source/math/vector.rst

+Vector
+======
+
+BaseVector
+``````````
+..  doxygenclass:: paddle::BaseVector
+    :members:
+
+Vector Template
+```````````````
+..  doxygenclass:: paddle::VectorT
+    :members:
+
+CpuVector Template
+``````````````````
+..  doxygenclass:: paddle::CpuVectorT
+    :members:
+
+GpuVector Template
+``````````````````
+..  doxygenclass:: paddle::GpuVectorT
+    :members:
+
+ParallelCpuVector Template
+``````````````````````````
+..  doxygenclass:: paddle::ParallelCpuVectorT
+    :members:
+
+ParallelGpuVector Template
+``````````````````````````
+..  doxygenclass:: paddle::ParallelGpuVectorT
+    :members:
+
+CpuGpuVector Template
+`````````````````````
+..  doxygenclass:: paddle::CpuGpuVectorT
+    :members:

doc/source/parameter/optimizer/index.rst → doc/source/parameter/index.rst

-Parameter Documents
-====================
+Parameter
+=========
 
 .. toctree::
-  :maxdepth: 3
+  :maxdepth: 2
 
+  parameter.rst
   optimizer.rst
+  updater.rst

doc/source/parameter/optimizer/optimizer.rst → doc/source/parameter/optimizer.rst

 Optimizer
-============
+=========
 
+ParameterOptimizer
+------------------
+.. doxygenfile:: paddle/parameter/ParameterOptimizer.h
+
+Regularizer
+-----------
+.. doxygenfile:: paddle/parameter/Regularizer.h
+
+FirstOrderOptimizer
+-------------------
 .. doxygenfile:: paddle/parameter/FirstOrderOptimizer.h
+
+AverageOptimizer
+----------------
 .. doxygenfile:: paddle/parameter/AverageOptimizer.h
-.. doxygenfile:: paddle/parameter/ParameterOptimizer.h
+
+OptimizerWithRegularizer
+------------------------
 .. doxygenfile:: paddle/parameter/OptimizerWithRegularizer.h

doc/source/parameter/parameter/parameter.rst → doc/source/parameter/parameter.rst

 Parameter
-=============
-
-Weight
---------
-.. doxygenfile:: paddle/parameter/Weight.h
-
-Regularizer
-------------
-.. doxygenfile:: paddle/parameter/Regularizer.h
+=========
 
 Parameter
--------------
+---------
 .. doxygenfile:: paddle/parameter/Argument.h
 .. doxygenfile:: paddle/parameter/Parameter.h
 .. doxygenfile:: paddle/parameter/ParallelParameter.h
+
+Weight
+------
+.. doxygenfile:: paddle/parameter/Weight.h

doc/source/parameter/parameter/index.rst

-Parameter Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  parameter.rst

doc/source/parameter/update/index.rst

-Parameter Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  update.rst

doc/source/parameter/update/update.rst → doc/source/parameter/updater.rst

-Update
-==========
+Updater
+=======
 
+Base
+----
 .. doxygenfile:: paddle/parameter/ParameterUpdaterBase.h
+
+Hook
+----
 .. doxygenfile:: paddle/parameter/ParameterUpdaterHook.h
-.. doxygenfile:: paddle/parameter/ParameterUpdateFunctions.h
 
+Functions
+---------
+.. doxygenfile:: paddle/parameter/ParameterUpdateFunctions.h

doc/source/pserver/client.rst

+Client
+======
+
+BaseClient
+----------
+..  doxygenclass:: paddle::BaseClient
+    :members:
+
+ParameterClient2
+----------------
+..  doxygenclass:: paddle::ParameterClient2
+    :members:

doc/source/pserver/client/client.rst

-Client
-=========
-
-.. doxygenclass:: paddle::BaseClient
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-.. doxygenclass:: paddle::ParameterClient2
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:

doc/source/pserver/client/index.rst

-Client Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  client.rst

doc/source/pserver/index.rst

+PServer
+=======
+
+.. toctree::
+  :maxdepth: 2
+
+  client.rst
+  network.rst
+  server.rst
+  utils.rst

doc/source/pserver/network.rst

+Network
+=======
+
+SocketServer
+------------
+..  doxygenclass:: paddle::SocketServer
+    :members:
+
+SocketWorker
+------------
+..  doxygenclass:: paddle::SocketWorker
+    :members:
+
+SocketClient
+------------
+..  doxygenclass:: paddle::SocketClient
+    :members:
+
+SocketChannel
+-------------
+..  doxygenclass:: paddle::SocketChannel
+    :members:
+
+MessageReader
+-------------
+..  doxygenclass:: paddle::MsgReader
+    :members:

doc/source/pserver/network/index.rst

-Network Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  network.rst

doc/source/pserver/network/network.rst

-Network
-==========
-
-Socket Server
-----------------
-.. doxygenclass:: paddle::SocketServer
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-Socket Worker
-----------------
-.. doxygenclass:: paddle::SocketWorker
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-Socket Client
-----------------
-.. doxygenclass:: paddle::SocketClient
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-Socket Channel
----------------
-.. doxygenclass:: paddle::SocketChannel
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-Message Reader
----------------
-.. doxygenclass:: paddle::MsgReader
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:

doc/source/pserver/server.rst

+Server
+======
+
+ProtoServer
+-----------
+..  doxygenclass:: paddle::ProtoServer
+    :members:
+
+ParameterServer2
+----------------
+..  doxygenclass:: paddle::ParameterServer2
+    :members:

doc/source/pserver/server/index.rst

-Server Documents
-====================
-
-.. toctree::
-  :maxdepth: 3
-
-  server.rst

doc/source/pserver/server/server.rst

-Server
-==========
-
-.. doxygenclass:: paddle::ProtoServer
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:
-
-.. doxygenclass:: paddle::ParameterServer2
-    :members:
-    :protected-members:
-    :private-members:
-    :undoc-members:

doc/source/trainer/trainer.rst → doc/source/trainer.rst

@@ -14,7 +14,7 @@ RemoteParameterUpdater
     :members:
 
 ConcurrentRemoteParameterUpdater
----------------------------------
+--------------------------------
 
 ..  doxygenclass:: paddle::ConcurrentRemoteParameterUpdater
     :members:

doc/source/utils/customStackTrace.rst

 CustomStackTrace
 ================
-
-
-class CustomStackTrace
-----------------------
-
 ..  doxygenclass:: paddle::CustomStackTrace
     :members:

doc/source/utils/enum.rst

-enumeration_wrapper
+Enumeration wrapper
 ===================
-
-
-namespace paddle::enumeration_wrapper
--------------------------------------
-
 ..  doxygennamespace:: paddle::enumeration_wrapper
-

doc/source/utils/index.rst

+Utils
+=====
+
+.. toctree::
+  :maxdepth: 2
+
+  lock.rst
+  queue.rst
+  thread.rst
+  customStackTrace.rst
+  enum.rst

doc/source/utils/lock.rst

-Thread
-======
+Lock
+====
 
-
-class Thread 
-------------
-
-..  doxygenclass:: paddle::Thread
+RWLock
+------
+..  doxygenclass:: paddle::RWLock
     :members:
 
-
-class ThreadWorker
-------------------
-
-..  doxygenclass:: paddle::ThreadWorker
+ReadLockGuard
+-------------
+..  doxygenclass:: paddle::ReadLockGuard
     :members:
 
-
-class SyncThreadPool 
---------------------
-
-..  doxygenclass:: paddle::SyncThreadPool 
+SpinLock
+--------
+..  doxygenclass:: paddle::SpinLock
     :members:
 
-
-class MultiThreadWorker 
------------------------
-
-..  doxygenclass:: paddle::MultiThreadWorker 
+Semaphore
+---------
+..  doxygenclass:: paddle::Semaphore
     :members:
 
+ThreadBarrier
+-------------
+..  doxygenclass:: paddle::ThreadBarrier
+    :members:
 
-class AsyncThreadPool 
----------------------
-
-..  doxygenclass:: paddle::AsyncThreadPool 
+LockedCondition
+---------------
+..  doxygenclass:: paddle::LockedCondition
     :members:

doc/source/utils/queue.rst

 Queue
 =====
 
-
-class Queue
-------------
-
+Queue
+-----
 ..  doxygenclass:: paddle::Queue
     :members:
 
-
-class BlockingQueue 
--------------------
-
+BlockingQueue 
+-------------
 ..  doxygenclass:: paddle::BlockingQueue 
     :members:

doc/source/utils/thread.rst

-Lock
-====
+Thread
+======
 
-
-class RWLock
-------------
-
-..  doxygenclass:: paddle::RWLock
+Thread 
+------
+..  doxygenclass:: paddle::Thread
     :members:
 
-class ReadLockGuard
--------------------
-
-..  doxygenclass:: paddle::ReadLockGuard
+ThreadWorker
+------------
+..  doxygenclass:: paddle::ThreadWorker
     :members:
 
-class SpinLock
+SyncThreadPool 
 --------------
-
-..  doxygenclass:: paddle::SpinLock
-    :members:
-
-class Semaphore
----------------
-
-..  doxygenclass:: paddle::Semaphore
+..  doxygenclass:: paddle::SyncThreadPool 
     :members:
     
-class ThreadBarrier
--------------------
-
-..  doxygenclass:: paddle::ThreadBarrier
+MultiThreadWorker 
+-----------------
+..  doxygenclass:: paddle::MultiThreadWorker 
     :members:
 
-class LockedCondition
----------------------
-
-..  doxygenclass:: paddle::LockedCondition
+AsyncThreadPool 
+---------------
+..  doxygenclass:: paddle::AsyncThreadPool
     :members:
-

python/paddle/trainer/config_parser.py

@@ -1111,7 +1111,7 @@ def parse_pool(pool, input_layer_name, pool_conf):
 
     config_assert(not pool.start, "start is deprecated in pooling.")
 
-    if pool.padding is not None
+    if pool.padding is not None:
         pool_conf.padding = pool.padding
     pool_conf.padding_y = default(pool.padding_y, pool_conf.padding)
     pool_conf.output_x = cnn_output_size(