Skip to content

Commit deabc8c

Browse files
reyoungreyoung
authored
Merge branch 'develop' into feature/clean_memcpy_async
2 parents 0c24b3f + 71fa3ca commit deabc8c

File tree

147 files changed

+4177
-730
lines changed

Some content is hidden

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

147 files changed

+4177
-730
lines changed

‎Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ ENV PATH=${PATH}:${GOROOT}/bin:${GOPATH}/bin
4949
RUN curl -s -q https://glide.sh/get | sh
5050

5151
# Install TensorRT
52-
# 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.
5357
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 | \
5458
tar -xz -C /usr/local && \
5559
cp -rf /usr/local/TensorRT/include /usr && \

‎benchmark/fluid/machine_translation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import time
2222
import distutils.util
2323

24-
import paddle.v2 as paddle
24+
import paddle
2525
import paddle.fluid as fluid
2626
import paddle.fluid.core as core
2727
import paddle.fluid.framework as framework

‎benchmark/fluid/mnist.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import argparse
2121
import time
2222

23-
import paddle.v2 as paddle
23+
import paddle
2424
import paddle.fluid as fluid
2525
import paddle.fluid.profiler as profiler
2626

‎benchmark/fluid/resnet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import cProfile, pstats, StringIO
2525

26-
import paddle.v2 as paddle
26+
import paddle
2727
import paddle.fluid as fluid
2828
import paddle.fluid.core as core
2929
import paddle.fluid.profiler as profiler

‎benchmark/fluid/stacked_dynamic_lstm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import time
2424

2525
import numpy
26-
import paddle.v2 as paddle
27-
import paddle.v2.dataset.imdb as imdb
26+
import paddle
27+
import paddle.dataset.imdb as imdb
2828
import paddle.fluid as fluid
29-
from paddle.v2 import batch
29+
import paddle.batch as batch
3030
import paddle.fluid.profiler as profiler
3131

3232

‎benchmark/fluid/vgg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import time
1919
import numpy as np
20-
import paddle.v2 as paddle
20+
import paddle
2121
import paddle.fluid as fluid
2222
import paddle.fluid.core as core
2323
import argparse

‎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.reader
60+
:members:
61+
:noindex:
62+
63+
.. automodule:: paddle.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:

0 commit comments

Comments
 (0)