Skip to content

Commit 9997c91

Browse files
author
ktlichkid
committed
Pull origin
Merge branch 'fix-10026' of github.com:ktlichkid/Paddle into fix-10026
2 parents 709a9ed + 5afc2a9 commit 9997c91

File tree

319 files changed

+6445
-1986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+6445
-1986
lines changed

‎Dockerfile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# A image for building paddle binaries
22
# Use cuda devel base image for both cpu and gpu environment
3+
4+
# When you modify it, please be aware of cudnn-runtime version
5+
# and libcudnn.so.x in paddle/scripts/docker/build.sh
36
FROM nvidia/cuda:8.0-cudnn7-devel-ubuntu16.04
47
MAINTAINER PaddlePaddle Authors <[email protected]>
58

@@ -46,7 +49,11 @@ ENV PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
4649
RUN curl -s -q https://glide.sh/get | sh
4750

4851
# Install TensorRT
49-
# The unnecessary files has been removed to make the library small. It only contains include and lib now.
52+
# following TensorRT.tar.gz is not the default official one, we do two miny changes:
53+
# 1. Remove the unnecessary files to make the library small. TensorRT.tar.gz only contains include and lib now,
54+
# and its size is only one-third of the official one.
55+
# 2. Manually add ~IPluginFactory() in IPluginFactory class of NvInfer.h, otherwise, it couldn't work in paddle.
56+
# See https://github.com/PaddlePaddle/Paddle/issues/10129 for details.
5057
RUN wget -qO- http://paddlepaddledeps.bj.bcebos.com/TensorRT-4.0.0.3.Ubuntu-16.04.4.x86_64-gnu.cuda-8.0.cudnn7.0.tar.gz | \
5158
tar -xz -C /usr/local && \
5259
cp -rf /usr/local/TensorRT/include /usr && \

‎cmake/tensorrt.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ if(TENSORRT_FOUND)
3030

3131
message(STATUS "Current TensorRT header is ${TENSORRT_INCLUDE_DIR}/NvInfer.h. "
3232
"Current TensorRT version is v${TENSORRT_MAJOR_VERSION}. ")
33+
include_directories(${TENSORRT_INCLUDE_DIR})
34+
list(APPEND EXTERNAL_LIBS ${TENSORRT_LIBRARY})
3335
endif()

‎doc/fluid/api/data.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
==================================
2+
Data Reader Interface and DataSets
3+
==================================
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
8+
data/data_reader.rst
9+
data/image.rst
10+
data/dataset.rst

‎doc/fluid/api/data/data_reader.rst‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
=====================
2+
Data Reader Interface
3+
=====================
4+
5+
6+
DataTypes
7+
=========
8+
9+
.. autofunction:: paddle.v2.data_type.dense_array
10+
:noindex:
11+
12+
.. autofunction:: paddle.v2.data_type.integer_value
13+
:noindex:
14+
15+
.. autofunction:: paddle.v2.data_type.integer_value_sequence
16+
:noindex:
17+
18+
.. autofunction:: paddle.v2.data_type.integer_value_sub_sequence
19+
:noindex:
20+
21+
.. autofunction:: paddle.v2.data_type.sparse_binary_vector
22+
:noindex:
23+
24+
.. autofunction:: paddle.v2.data_type.sparse_binary_vector_sequence
25+
:noindex:
26+
27+
.. autofunction:: paddle.v2.data_type.sparse_binary_vector_sub_sequence
28+
:noindex:
29+
30+
.. autofunction:: paddle.v2.data_type.sparse_float_vector
31+
:noindex:
32+
33+
.. autofunction:: paddle.v2.data_type.sparse_float_vector_sequence
34+
:noindex:
35+
36+
.. autofunction:: paddle.v2.data_type.sparse_float_vector_sub_sequence
37+
:noindex:
38+
39+
.. autofunction:: paddle.v2.data_type.sparse_non_value_slot
40+
:noindex:
41+
42+
.. autofunction:: paddle.v2.data_type.sparse_value_slot
43+
:noindex:
44+
45+
.. autoclass:: paddle.v2.data_type.InputType
46+
:members:
47+
:noindex:
48+
49+
DataFeeder
50+
==========
51+
52+
.. automodule:: paddle.v2.data_feeder
53+
:members:
54+
:noindex:
55+
56+
Reader
57+
======
58+
59+
.. automodule:: paddle.v2.reader
60+
:members:
61+
:noindex:
62+
63+
.. automodule:: paddle.v2.reader.creator
64+
:members:
65+
:noindex:
66+
67+
minibatch
68+
=========
69+
70+
.. automodule:: paddle.v2.minibatch
71+
:members:
72+
:noindex:

‎doc/fluid/api/data/dataset.rst‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
Dataset
2+
=======
3+
4+
.. automodule:: paddle.dataset
5+
:members:
6+
:noindex:
7+
8+
mnist
9+
+++++
10+
11+
.. automodule:: paddle.dataset.mnist
12+
:members:
13+
:noindex:
14+
15+
cifar
16+
+++++
17+
18+
.. automodule:: paddle.dataset.cifar
19+
:members:
20+
:noindex:
21+
22+
conll05
23+
+++++++
24+
25+
.. automodule:: paddle.dataset.conll05
26+
:members: get_dict,get_embedding,test
27+
:noindex:
28+
29+
imdb
30+
++++
31+
32+
.. automodule:: paddle.dataset.imdb
33+
:members:
34+
:noindex:
35+
36+
imikolov
37+
++++++++
38+
39+
.. automodule:: paddle.dataset.imikolov
40+
:members:
41+
:noindex:
42+
43+
movielens
44+
+++++++++
45+
46+
.. automodule:: paddle.dataset.movielens
47+
:members:
48+
:noindex:
49+
50+
.. autoclass:: paddle.dataset.movielens.MovieInfo
51+
:noindex:
52+
53+
.. autoclass:: paddle.dataset.movielens.UserInfo
54+
:noindex:
55+
56+
sentiment
57+
+++++++++
58+
59+
.. automodule:: paddle.dataset.sentiment
60+
:members:
61+
:noindex:
62+
63+
uci_housing
64+
+++++++++++
65+
66+
.. automodule:: paddle.dataset.uci_housing
67+
:members:
68+
:noindex:
69+
70+
wmt14
71+
+++++
72+
73+
.. automodule:: paddle.dataset.wmt14
74+
:members:
75+
:noindex:
76+
77+
wmt16
78+
+++++
79+
80+
.. automodule:: paddle.dataset.wmt16
81+
:members:
82+
:noindex:

‎doc/fluid/api/data/image.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Image Interface
2+
===============
3+
4+
.. automodule:: paddle.v2.image
5+
:members:

‎doc/fluid/api/evaluator.rst‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,24 @@
55
evaluator
66
=========
77

8-
Accuracy
9-
--------
8+
ChunkEvaluator
9+
--------------
1010

11-
.. autoclass:: paddle.fluid.evaluator.Accuracy
11+
.. autoclass:: paddle.fluid.evaluator.ChunkEvaluator
1212
:members:
1313
:noindex:
1414

15-
ChunkEvaluator
15+
EditDistance
1616
--------------
1717

18-
.. autoclass:: paddle.fluid.evaluator.ChunkEvaluator
18+
.. autoclass:: paddle.fluid.evaluator.EditDistance
1919
:members:
2020
:noindex:
2121

22+
DetectionMAP
23+
--------------
24+
25+
.. autoclass:: paddle.fluid.evaluator.DetectionMAP
26+
:members:
27+
:noindex:
28+

‎doc/fluid/api/index_en.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ Fluid
1616
profiler.rst
1717
regularizer.rst
1818
io.rst
19+
data.rst

‎doc/fluid/api/initializer.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ XavierInitializer
6767
.. autoclass:: paddle.fluid.initializer.XavierInitializer
6868
:members:
6969
:noindex:
70-
MSRA
71-
------
70+
7271

7372
MSRAInitializer
7473
-----------------

‎doc/fluid/api/optimizer.rst‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,51 @@ DecayedAdagrad
4747
:members:
4848
:noindex:
4949

50+
SGDOptimizer
51+
------------
52+
53+
.. autoclass:: paddle.fluid.optimizer.SGDOptimizer
54+
:members:
55+
:noindex:
56+
57+
MomentumOptimizer
58+
-----------------
59+
60+
.. autoclass:: paddle.fluid.optimizer.MomentumOptimizer
61+
:members:
62+
:noindex:
63+
64+
AdagradOptimizer
65+
----------------
66+
67+
.. autoclass:: paddle.fluid.optimizer.AdagradOptimizer
68+
:members:
69+
:noindex:
70+
71+
AdamOptimizer
72+
-------------
73+
74+
.. autoclass:: paddle.fluid.optimizer.AdamOptimizer
75+
:members:
76+
:noindex:
77+
78+
AdamaxOptimizer
79+
---------------
80+
81+
.. autoclass:: paddle.fluid.optimizer.AdamaxOptimizer
82+
:members:
83+
:noindex:
84+
85+
DecayedAdagradOptimizer
86+
-----------------------
87+
88+
.. autoclass:: paddle.fluid.optimizer.DecayedAdagradOptimizer
89+
:members:
90+
:noindex:
91+
5092
Adadelta
5193
--------------
5294

5395
.. autoclass:: paddle.fluid.optimizer.AdadeltaOptimizer
5496
:members:
5597
:noindex:
56-

0 commit comments

Comments
 (0)