Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix_dead_link

.travis.yml

@@ -50,7 +50,7 @@ before_install:
     fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo paddle/scripts/travis/before_install.linux.sh; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
-  - pip install wheel protobuf sphinx breathe recommonmark virtualenv numpy sphinx_rtd_theme
+  - pip install wheel protobuf sphinx recommonmark virtualenv numpy sphinx_rtd_theme
 script:
   - paddle/scripts/travis/main.sh
 notifications:

cmake/check_packages.cmake

@@ -30,7 +30,6 @@ if(WITH_DOC)
   find_package(Sphinx REQUIRED)
   find_package(Doxygen REQUIRED)
   find_python_module(recommonmark REQUIRED)
-  find_python_module(breathe REQUIRED)
 endif()
 
 if(WITH_SWIG_PY)

doc/getstarted/build_and_install/build_from_source_en.md

@@ -79,7 +79,7 @@ As a simple example, consider the following:
 
     ```bash
     pip install 'sphinx>=1.4.0'
-    pip install sphinx_rtd_theme breathe recommonmark
+    pip install sphinx_rtd_theme recommonmark
 
     # install doxygen on Ubuntu
     sudo apt-get install doxygen 

doc/howto/source/api.rst

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

doc/howto/source/cuda/index.rst

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

doc/howto/source/cuda/matrix.rst

-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
-
-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
-
-Sparse Matrix
--------------
-
-hl_sparse.h
-```````````
-.. doxygenfile:: paddle/cuda/include/hl_sparse.h
-
-hl_sparse.ph
-````````````
-.. doxygenfile:: paddle/cuda/include/hl_sparse.ph

doc/howto/source/cuda/nn.rst

-Neural Network
-==============
-
-Base
-----
-
-.. doxygenfile:: paddle/cuda/include/hl_gpu.h
-.. doxygenfile:: paddle/cuda/include/hl_functions.h
-.. doxygenfile:: paddle/cuda/include/hl_avx_functions.h
-.. doxygenfile:: paddle/cuda/include/hl_gpu_functions.cuh
-.. 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/howto/source/cuda/utils.rst

-Utils
-=====
-
-Dynamic Link Libs
------------------
-.. 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
-
-HPPL Base
----------
-.. doxygenfile:: paddle/cuda/include/hl_base.h
-
-CUBLAS Wrapper
---------------
-.. doxygenfile:: paddle/cuda/include/hl_cuda_cublas.h
-
-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/howto/source/gserver/activations.rst

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

doc/howto/source/gserver/dataproviders.rst

-==============
-Data Providers
-==============
-
-DataProviders
-=============
-
-Base
-----
-..  doxygenclass:: paddle::DataProvider
-    :members:
-
-DataProviderGroup
------------------
-..  doxygenclass:: paddle::DataProviderGroup
-    :members:
-
-MultiDataProvider
------------------
-..  doxygenclass:: paddle::MultiDataProvider
-    :members:
-
-PyDataProvider
-==============
-
-IFieldScanner
--------------
-..  doxygenclass:: paddle::IFieldScanner
-    :members:
-
-DenseScanner
--------------
-..  doxygenclass:: paddle::DenseScanner
-    :members:
-
-IndexScanner
--------------
-..  doxygenclass:: paddle::IndexScanner
-    :members:
-
-SparseNonValueScanner
----------------------
-..  doxygenclass:: paddle::SparseNonValueScanner
-    :members:
-
-SparseValueScanner
-------------------
-..  doxygenclass:: paddle::SparseValueScanner
-    :members:
-
-SequenceScanner
----------------
-..  doxygenclass:: paddle::SparseValueScanner
-    :members:
-
-IPyDataProviderCache
---------------------
-..  doxygenclass:: paddle::IPyDataProviderCache
-    :members:
-
-NoCacheStrategy
----------------
-..  doxygenclass:: paddle::NoCacheStrategy
-    :members:
-
-CacheOnePassInMemory
---------------------
-..  doxygenclass:: paddle::CacheOnePassInMemory
-    :members:
-
-IPyDataProvider
----------------
-..  doxygenclass:: paddle::PyDataProvider2
-    :members:
-
-ProtoDataProvider
-=================
-
-ProtoDataProvider
-----------------
-..  doxygenclass:: paddle::ProtoDataProvider
-    :members:
-
-ProtoSequenceDataProvider
--------------------------
-..  doxygenclass:: paddle::ProtoSequenceDataProvider
-    :members:

doc/howto/source/gserver/evaluators.rst

-==========
-Evaluators
-==========
-
-Base
-====
-
-..  doxygenclass:: paddle::Evaluator
-    :members:
-
-Sum
-===
-
-SumEvaluator
-------------
-..  doxygenclass:: paddle::SumEvaluator
-    :members:
-
-ColumnSumEvaluator
-------------------
-..  doxygenclass:: paddle::ColumnSumEvaluator
-    :members:
-
-Classification
-==============
-
-ClassificationErrorEvaluator
----------------------------
-..  doxygenclass:: paddle::ClassificationErrorEvaluator
-    :members:
-
-SequenceClassificationErrorEvaluator
-------------------------------------
-..  doxygenclass:: paddle::SequenceClassificationErrorEvaluator
-    :members:
-
-AucEvaluator
--------------
-..  doxygenclass:: paddle::AucEvaluator
-    :members:
-
-PrecisionRecallEvaluator
-------------------------
-..  doxygenclass:: paddle::PrecisionRecallEvaluator
-    :members:
-
-ChunkEvaluator
---------------
-..  doxygenclass:: paddle::ChunkEvaluator
-    :members:
-
-CTCEvaluator
-------------
-..  doxygenclass:: paddle::CTCErrorEvaluator
-    :members:
-
-
-Rank
-====
-
-PnpairEvaluator
--------------
-..  doxygenclass:: paddle::PnpairEvaluator
-    :members:
-
-AucEvaluator
--------------
-..  doxygenclass:: paddle::RankAucEvaluator
-    :members:
-
-
-Printer
-=======
-
-ValuePrinter
--------------
-..  doxygenclass:: paddle::ValuePrinter
-    :members:
-
-GradientPrinter
----------------
-..  doxygenclass:: paddle::GradientPrinter
-    :members:
-
-MaxIdPrinter
-------------
-..  doxygenclass:: paddle::MaxIdPrinter
-    :members:
-
-MaxFramePrinter
----------------
-..  doxygenclass:: paddle::MaxFramePrinter
-    :members:
-
-SequenceTextPrinter
-------------------
-..  doxygenclass:: paddle::SequenceTextPrinter
-    :members:
-
-ClassificationErrorPrinter
---------------------------
-..  doxygenclass:: paddle::ClassificationErrorPrinter
-    :members:

doc/howto/source/gserver/gradientmachines.rst

-Gradient Machines
-=================
-
-GradientMachine
----------------
-..  doxygenclass:: paddle::GradientMachine
-    :members:
-
-GradientMachineMode
--------------------
-..  doxygenclass:: paddle::IGradientMachineMode
-    :members:
-
-MultiGradientMachine
---------------------
-..  doxygenclass:: paddle::MultiGradientMachine
-    :members:
-
-TrainerThread
-`````````````
-..  doxygenclass:: paddle::TrainerThread
-    :members:
-
-RecurrentGradientMachine
-------------------------
-..  doxygenclass:: paddle::RecurrentGradientMachine
-    :members:

doc/howto/source/gserver/index.rst

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

doc/howto/source/gserver/layers.rst

-======
-Layers
-======
-
-Base
-====
-
-Layer 
------
-..  doxygenclass:: paddle::Layer
-    :members:
-
-Projection
-----------
-..  doxygenclass:: paddle::Projection
-    :members:
-
-Operator
---------
-..  doxygenclass:: paddle::Operator
-    :members:
-    
-Data Layer
-==========
-
-..  doxygenclass:: paddle::DataLayer
-    :members:
-
-Fully Connected Layers
-======================
-
-FullyConnectedLayer
--------------------
-..  doxygenclass:: paddle::FullyConnectedLayer
-    :members:
-
-SelectiveFullyConnectedLayer
-----------------------------
-..  doxygenclass:: paddle::SelectiveFullyConnectedLayer
-    :members:
-
-Conv Layers
-===========
-
-ConvBaseLayer
--------------
-..  doxygenclass:: paddle::ConvBaseLayer
-    :members:
-
-ConvOperator
-------------
-..  doxygenclass:: paddle::ConvOperator
-    :members:
-
-ConvShiftLayer
---------------
-..  doxygenclass:: paddle::ConvShiftLayer
-    :members:
-
-CudnnConvLayer
---------------
-..  doxygenclass:: paddle::CudnnConvLayer
-    :members:
-
-ExpandConvBaseLayer
--------------------
-..  doxygenclass:: paddle::ExpandConvBaseLayer
-    :members:
-
-ExpandConvLayer
----------------
-..  doxygenclass:: paddle::ExpandConvLayer
-    :members:
-
-ContextProjection
------------------
-..  doxygenclass:: paddle::ContextProjection
-    :members:
-
-Pooling Layers
-==============
-
-PoolLayer
----------
-..  doxygenclass:: paddle::PoolLayer
-    :members:
-
-PoolProjectionLayer
--------------------
-..  doxygenclass:: paddle::PoolProjectionLayer
-    :members:
-
-CudnnPoolLayer
---------------
-..  doxygenclass:: paddle::CudnnPoolLayer
-    :members:
-
-SpatialPyramidPoolLayer
------------------------
-..  doxygenclass:: paddle::SpatialPyramidPoolLayer
-    :members:
-
-MaxOutLayer
------------
-..  doxygenclass:: paddle::MaxOutLayer
-    :members:
-
-Norm Layers
-===========
-
-NormLayer
----------
-..  doxygenclass:: paddle::NormLayer
-    :members:
-
-CMRProjectionNormLayer
-----------------------
-..  doxygenclass:: paddle::CMRProjectionNormLayer
-    :members:
-
-DataNormLayer
--------------
-..  doxygenclass:: paddle::DataNormLayer
-    :members:
-
-ResponseNormLayer
------------------
-..  doxygenclass:: paddle::ResponseNormLayer
-    :members:
-
-BatchNormBaseLayer
-------------------
-..  doxygenclass:: paddle::BatchNormBaseLayer
-    :members:
-
-BatchNormalizationLayer
------------------------
-..  doxygenclass:: paddle::BatchNormalizationLayer
-    :members:
-
-CudnnBatchNormLayer
------------------------
-..  doxygenclass:: paddle::CudnnBatchNormLayer
-    :members:
-
-SumToOneNormLayer
------------------
-..  doxygenclass:: paddle::SumToOneNormLayer
-    :members:
-
-Activation Layer
-================
-
-ParameterReluLayer
-------------------
-..  doxygenclass:: paddle::ParameterReluLayer
-    :members:
-
-Recurrent Layers
-================
-
-RecurrentLayer
---------------
-..  doxygenclass:: paddle::RecurrentLayer
-    :members:
-
-SequenceToBatch
----------------
-..  doxygenclass:: paddle::SequenceToBatch
-    :members:
-
-LSTM
-----
-LstmLayer
-`````````
-..  doxygenclass:: paddle::LstmLayer
-    :members:
-
-LstmStepLayer
-`````````````
-..  doxygenclass:: paddle::LstmStepLayer
-    :members:
-
-LstmCompute
-```````````
-..  doxygenclass:: paddle::LstmCompute
-    :members:
-
-MDLSTM
-------
-MDLstmLayer
-```````````
-..  doxygenclass:: paddle::MDLstmLayer
-    :members:
-
-CoordIterator
-`````````````
-..  doxygenclass:: paddle::CoordIterator
-    :members:
-
-GRU
----
-GatedRecurrentLayer
-```````````````````
-..  doxygenclass:: paddle::GatedRecurrentLayer
-    :members:
-
-GruStepLayer
-````````````
-..  doxygenclass:: paddle::GruStepLayer
-    :members:
-
-GruCompute
-``````````
-..  doxygenclass:: paddle::GruCompute
-    :members:
-
-Recurrent Layer Group
-=====================
-
-AgentLayer
-----------
-..  doxygenclass:: paddle::AgentLayer
-    :members:
-
-SequenceAgentLayer
-------------------
-..  doxygenclass:: paddle::SequenceAgentLayer
-    :members:
-
-GatherAgentLayer
-----------------
-..  doxygenclass:: paddle::GatherAgentLayer
-    :members:
-
-SequenceGatherAgentLayer
-------------------------
-..  doxygenclass:: paddle::SequenceGatherAgentLayer
-    :members:
-
-ScatterAgentLayer
------------------
-..  doxygenclass:: paddle::ScatterAgentLayer
-    :members:
-
-SequenceScatterAgentLayer
--------------------------
-..  doxygenclass:: paddle::SequenceScatterAgentLayer
-    :members:
-
-GetOutputLayer
---------------
-..  doxygenclass:: paddle::GetOutputLayer
-    :members:
-
-Mixed Layer
-===========
-..  doxygenclass:: paddle::MixedLayer
-    :members:
-
-DotMulProjection
-----------------
-..  doxygenclass:: paddle::DotMulProjection
-    :members:
-
-DotMulOperator
---------------
-..  doxygenclass:: paddle::DotMulOperator
-    :members:
-
-FullMatrixProjection
---------------------
-..  doxygenclass:: paddle::FullMatrixProjection
-    :members:
-
-IdentityProjection
-------------------
-..  doxygenclass:: paddle::IdentityProjection
-    :members:
-
-IdentityOffsetProjection
-------------------------
-..  doxygenclass:: paddle::IdentityOffsetProjection
-    :members:
-
-TableProjection
----------------
-..  doxygenclass:: paddle::TableProjection
-    :members:
-
-TransposedFullMatrixProjection
-------------------------------
-..  doxygenclass:: paddle::TransposedFullMatrixProjection
-    :members:
-
-Aggregate Layers
-================
-
-Aggregate
----------
-AverageLayer
-````````````
-..  doxygenclass:: paddle::AverageLayer
-    :members:
-
-MaxLayer
-````````
-..  doxygenclass:: paddle::MaxLayer
-    :members:
-
-SequenceLastInstanceLayer
-`````````````````````````
-..  doxygenclass:: paddle::SequenceLastInstanceLayer
-    :members:
-
-Concat
-------
-ConcatenateLayer
-````````````````
-..  doxygenclass:: paddle::ConcatenateLayer
-    :members:
-
-ConcatenateLayer2
-`````````````````
-..  doxygenclass:: paddle::ConcatenateLayer2
-    :members:
-
-SequenceConcatLayer
-```````````````````
-..  doxygenclass:: paddle::SequenceConcatLayer
-    :members:
-
-Subset
-------
-SubSequenceLayer
-````````````````
-..  doxygenclass:: paddle::SubSequenceLayer
-    :members:
-
-Reshaping Layers
-================
-
-BlockExpandLayer
-----------------
-..  doxygenclass:: paddle::BlockExpandLayer
-    :members:
-
-ExpandLayer
------------
-..  doxygenclass:: paddle::ExpandLayer
-    :members:
-
-FeatureMapExpandLayer
----------------------
-..  doxygenclass:: paddle::FeatureMapExpandLayer
-    :members:
-
-ResizeLayer
------------
-..  doxygenclass:: paddle::ResizeLayer
-    :members:
-
-SequenceReshapeLayer
---------------------
-..  doxygenclass:: paddle::SequenceReshapeLayer
-    :members:
-
-Math Layers
-===========
-
-AddtoLayer
-----------
-..  doxygenclass:: paddle::AddtoLayer
-    :members:
-
-ConvexCombinationLayer
-----------------------
-..  doxygenclass:: paddle::ConvexCombinationLayer
-    :members:
-
-InterpolationLayer
-------------------
-..  doxygenclass:: paddle::InterpolationLayer
-    :members:
-
-MultiplexLayer
---------------
-..  doxygenclass:: paddle::MultiplexLayer
-    :members:
-
-OuterProdLayer
---------------
-..  doxygenclass:: paddle::OuterProdLayer
-    :members:
-
-PowerLayer
-----------
-..  doxygenclass:: paddle::PowerLayer
-    :members:
-
-ScalingLayer
-------------
-..  doxygenclass:: paddle::ScalingLayer
-    :members:
-
-SlopeInterceptLayer
--------------------
-..  doxygenclass:: paddle::SlopeInterceptLayer
-    :members:
-
-TensorLayer
-------------
-..  doxygenclass:: paddle::TensorLayer
-    :members:
-
-TransLayer
-----------
-..  doxygenclass:: paddle::TransLayer
-    :members:
-
-Sampling Layers
-===============
-
-BilinearInterpLayer
--------------------
-..  doxygenclass:: paddle::BilinearInterpLayer
-    :members:
-
-MultinomialSampler
-------------------
-..  doxygenclass:: paddle::MultinomialSampler
-    :members:
-
-MaxIdLayer
-----------
-..  doxygenclass:: paddle::MaxIdLayer
-    :members:
-
-SamplingIdLayer
----------------
-..  doxygenclass:: paddle::SamplingIdLayer
-    :members:
-
-Cost Layers
-===========
-
-CostLayer
------------
-..  doxygenclass:: paddle::CostLayer
-    :members:
-
-HuberTwoClass
-`````````````
-..  doxygenclass:: paddle::HuberTwoClass
-    :members:
-
-LambdaCost
-```````````
-..  doxygenclass:: paddle::LambdaCost
-    :members:
-
-MultiBinaryLabelCrossEntropy
-````````````````````````````
-..  doxygenclass:: paddle::MultiBinaryLabelCrossEntropy
-    :members:
-
-MultiClassCrossEntropy
-```````````````````````
-..  doxygenclass:: paddle::MultiClassCrossEntropy
-    :members:
-
-MultiClassCrossEntropyWithSelfNorm
-``````````````````````````````````
-..  doxygenclass:: paddle::MultiClassCrossEntropyWithSelfNorm
-    :members:
-
-RankingCost
-```````````
-..  doxygenclass:: paddle::RankingCost
-    :members:
-
-SoftBinaryClassCrossEntropy
-```````````````````````````
-..  doxygenclass:: paddle::SoftBinaryClassCrossEntropy
-    :members:
-
-SumOfSquaresCostLayer
-`````````````````````
-..  doxygenclass:: paddle::SumOfSquaresCostLayer
-    :members:
-
-SumCostLayer
-`````````````````````
-..  doxygenclass:: paddle::SumCostLayer
-    :members:
-
-CosSimLayer
------------
-..  doxygenclass:: paddle::CosSimLayer
-    :members:
-
-CosSimVecMatLayer
------------------
-..  doxygenclass:: paddle::CosSimVecMatLayer
-    :members:
-
-CRFDecodingLayer
-----------------
-..  doxygenclass:: paddle::CRFDecodingLayer
-    :members:
-
-CRFLayer
---------
-..  doxygenclass:: paddle::CRFLayer
-    :members:
-
-CTCLayer
---------
-..  doxygenclass:: paddle::CTCLayer
-    :members:
-
-HierarchicalSigmoidLayer
-------------------------
-..  doxygenclass:: paddle::HierarchicalSigmoidLayer
-    :members:
-
-LinearChainCRF
---------------
-..  doxygenclass:: paddle::LinearChainCRF
-    :members:
-
-LinearChainCTC
---------------
-..  doxygenclass:: paddle::LinearChainCTC
-    :members:
-
-NCELayer
---------
-..  doxygenclass:: paddle::NCELayer
-    :members:
-
-Validation Layers
------------------
-
-ValidationLayer
-```````````````
-..  doxygenclass:: paddle::ValidationLayer
-    :members:
-
-AucValidation
-`````````````
-..  doxygenclass:: paddle::AucValidation
-    :members:
-
-PnpairValidation
-````````````````
-..  doxygenclass:: paddle::PnpairValidation
-    :members:
-
-Check Layers
-============
-
-EosIdCheckLayer
----------------
-..  doxygenclass:: paddle::EosIdCheckLayer
-    :members:

doc/howto/source/gserver/neworks.rst

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

doc/howto/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/howto/source/math/functions.rst

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

doc/howto/source/math/index.rst

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

doc/howto/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/howto/source/math/utils.rst

-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/howto/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/howto/source/parameter/index.rst

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

doc/howto/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
-
-OptimizerWithRegularizer
-------------------------
-.. doxygenfile:: paddle/parameter/OptimizerWithRegularizer.h

doc/howto/source/parameter/parameter.rst

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

doc/howto/source/parameter/updater.rst

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

doc/howto/source/pserver/client.rst

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

doc/howto/source/pserver/index.rst

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

doc/howto/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/howto/source/pserver/server.rst

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

doc/howto/source/trainer.rst

-Trainer
-=======
-
-TrainerStats
-------------
-
-..  doxygenclass:: paddle::TrainerStats
-    :members:
-
-RemoteParameterUpdater
------------------------
-
-..  doxygenclass:: paddle::RemoteParameterUpdater
-    :members:
-
-ConcurrentRemoteParameterUpdater
---------------------------------
-
-..  doxygenclass:: paddle::ConcurrentRemoteParameterUpdater
-    :members:
-
-SparseRemoteParameterUpdater
-----------------------------
-
-..  doxygenclass:: paddle::SparseRemoteParameterUpdater
-    :members:
-
-SparseRemoteParameterUpdaterComposite
--------------------------------------
-
-..  doxygenclass:: paddle::SparseRemoteParameterUpdaterComposite
-    :members:

doc/howto/source/utils/customStackTrace.rst

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

doc/howto/source/utils/enum.rst

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

doc/howto/source/utils/index.rst

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

doc/howto/source/utils/lock.rst

-Lock
-====
-
-RWLock
-------
-..  doxygenclass:: paddle::RWLock
-    :members:
-
-ReadLockGuard
--------------
-..  doxygenclass:: paddle::ReadLockGuard
-    :members:
-
-SpinLock
---------
-..  doxygenclass:: paddle::SpinLock
-    :members:
-
-Semaphore
----------
-..  doxygenclass:: paddle::Semaphore
-    :members:
-
-ThreadBarrier
--------------
-..  doxygenclass:: paddle::ThreadBarrier
-    :members:
-
-LockedCondition
----------------
-..  doxygenclass:: paddle::LockedCondition
-    :members:

doc/howto/source/utils/queue.rst

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

doc/howto/source/utils/thread.rst

-Thread
-======
-
-Thread 
-------
-..  doxygenclass:: paddle::Thread
-    :members:
-
-ThreadWorker
-------------
-..  doxygenclass:: paddle::ThreadWorker
-    :members:
-
-SyncThreadPool 
---------------
-..  doxygenclass:: paddle::SyncThreadPool 
-    :members:
-    
-MultiThreadWorker 
------------------
-..  doxygenclass:: paddle::MultiThreadWorker 
-    :members:
-
-AsyncThreadPool 
----------------
-..  doxygenclass:: paddle::AsyncThreadPool
-    :members:

doc/tutorials/quick_start/index_en.md

@@ -391,7 +391,8 @@ paddle train \
 --use_gpu=false
 ```
 
-If you want to install the remote training platform, which enables distributed training on clusters, follow the instructions here: <a href = "../../howto/cluster/cluster_train_en.html">Platform</a> documentation. We do not provide examples on how to train on clusters. Please refer to other demos or platform training documentation for mode details on training on clusters.
+We do not provide examples on how to train on clusters. If you want to train on clusters, please follow the <a href = "../../howto/cluster/cluster_train_en.html">distributed training</a> documentation or other demos for mode details.
+
 ## Inference
 You can use the trained model to perform prediction on the dataset with no labels. You can also evaluate the model on dataset with labels to obtain its test accuracy.
 <center> ![](./PipelineTest_en.png) </center>

paddle/scripts/docker/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update \
     && apt-get clean -y
 RUN cd /usr/src/gtest && cmake . && make && sudo cp *.a /usr/lib
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
-    sphinx sphinx_rtd_theme breathe recommonmark
+    sphinx sphinx_rtd_theme recommonmark
 
 # cmake tends to hide and blur the dependencies between code modules, as
 # noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are

paddle/scripts/docker/Dockerfile.gpu

@@ -13,7 +13,7 @@ RUN apt-get update \
     && apt-get clean -y
 RUN cd /usr/src/gtest && cmake . && make && sudo cp *.a /usr/lib
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
-    sphinx sphinx_rtd_theme breathe recommonmark
+    sphinx sphinx_rtd_theme recommonmark
 
 # cmake tends to hide and blur the dependencies between code modules, as
 # noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are

paddle/scripts/tools/build_docs/Dockerfile

@@ -3,5 +3,5 @@ COPY build.sh /
 RUN pip install sphinx &&\
     pip install sphinx_rtd_theme &&\
     apt install -y doxygen graphviz &&\
-    pip install breathe recommonmark numpy protobuf==2.6.1
+    pip install recommonmark numpy protobuf==2.6.1
 CMD /build.sh

python/paddle/trainer_config_helpers/tests/configs/generate_protostr.sh

@@ -11,10 +11,12 @@ for conf in ${configs[*]}
 do
     echo "Generating " $conf
     python -m paddle.utils.dump_config $conf.py > $protostr/$conf.protostr.unittest
+    cat ${conf}.py |python test_config_parser_for_non_file_config.py > $protostr/$conf.protostr.non_file_config.unittest
 done
 
 for conf in ${whole_configs[*]}
 do
     echo "Generating " $conf
     python -m paddle.utils.dump_config $conf.py "" --whole > $protostr/$conf.protostr.unittest
+    cat ${conf}.py |python test_config_parser_for_non_file_config.py --whole > $protostr/$conf.protostr.non_file_config.unittest
 done

python/paddle/trainer_config_helpers/tests/configs/run_tests.sh

@@ -17,6 +17,7 @@ if [ -z $1 ]; then
       base_protostr=$protostr/$file
       new_protostr=$protostr/$file.unittest
       diff $base_protostr $new_protostr -u
+      diff $protostr/$file $protostr/$file.non_file_config.unittest -u
   done
 else
   for file in ${configs[*]}
@@ -24,6 +25,9 @@ else
     if ! $1 $protostr/$file.protostr $protostr/$file.protostr.unittest; then
       diff $protostr/$file.protostr $protostr/$file.protostr.unittest -u
     fi
+    if ! $1 $protostr/$file.protostr $protostr/$file.protostr.non_file_config.unittest; then
+      diff $protostr/$file.protostr $protostr/$file.protostr.non_file_config.unittest -u
+    fi
   done
 
   for file in ${whole_configs[*]}
@@ -31,5 +35,8 @@ else
     if ! $1 $protostr/$file.protostr $protostr/$file.protostr.unittest --whole; then
       diff $protostr/$file.protostr $protostr/$file.protostr.unittest -u
     fi
+    if ! $1 $protostr/$file.protostr $protostr/$file.protostr.non_file_config.unittest --whole; then
+      diff $protostr/$file.protostr $protostr/$file.protostr.non_file_config.unittest -u
+    fi
   done
 fi

python/paddle/trainer_config_helpers/tests/configs/test_config_parser_for_non_file_config.py

+#!/usr/bin/env python
+# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+import re
+import getopt
+
+def main(print_whole_config, globals, locals):
+  '''
+     this test will all test_config.py
+  '''
+  cmdstr = """from paddle.trainer.config_parser import parse_config\n"""
+  importstr = ""
+  functionstr = ""
+
+  for line in sys.stdin:
+    if re.match("^import", line) or re.match("^from.*import", line):
+      importstr = importstr + line
+    else:
+      functionstr = functionstr + "  " + line
+
+  cmdstr = cmdstr + importstr + """def configs():\n""" + functionstr
+  #cmdstr = cmdstr + """def configs():\n""" + importstr + functionstr
+  if print_whole_config:
+    cmdstr = cmdstr + """print parse_config(configs, "")"""
+  else:
+    cmdstr = cmdstr + """print parse_config(configs, "").model_config"""
+
+  exec(cmdstr, globals, locals)
+
+if __name__ == '__main__':
+  whole = False
+  opts, args = getopt.getopt(sys.argv[1:], "", ["whole"])
+  for op, value in opts:
+    if op == "--whole":
+      whole = True
+  main(whole, globals(), locals())