Skip to content

Commit a50230a

Browse files
typhoonzerotyphoonzero
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_raw_var_type
2 parents 9b5be6e + 95ea54f commit a50230a

File tree

300 files changed

+778
-577
lines changed

Some content is hidden

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

300 files changed

+778
-577
lines changed

‎Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ COPY ./paddle/scripts/docker/root/ /root/
2222

2323
RUN apt-get update && \
2424
apt-get install -y \
25-
git python-pip python-dev openssh-server bison libnccl-dev \
25+
git python-pip python-dev openssh-server bison \
26+
libnccl2=2.1.2-1+cuda8.0 libnccl-dev=2.1.2-1+cuda8.0 \
2627
wget unzip unrar tar xz-utils bzip2 gzip coreutils ntp \
2728
curl sed grep graphviz libjpeg-dev zlib1g-dev \
2829
python-matplotlib gcc-4.8 g++-4.8 \

‎doc/api/index_cn.rst

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎doc/api/index_en.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ API
44
.. toctree::
55
:maxdepth: 1
66

7+
overview.rst
78
v2/model_configs.rst
89
v2/data.rst
910
v2/run_logic.rst

‎doc/api/overview.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
V2 API Overview
2+
================
3+
4+
The PaddlePaddle V2 API is designed to provide a modern user interface for PaddlePaddle V1(the original layer-based platform of PaddlePaddle),
5+
it proposes some high-level concepts such as `Layers <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/layer.html>`_ , `Optimizer <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/optimizer.html>`_ , `Evaluator <http://www.paddlepaddle.org/docs/develop/api/en/v2/config/evaluators.html>`_ and `Data Reader <http://www.paddlepaddle.org/docs/develop/api/en/v2/data/data_reader.html>`_ to make the model configuration more familiar to users.
6+
7+
A model is composed of the computation described by a group of `Layers`, with `Evaluator` to define the error, `Optimizer` to update the parameters and `Data Reader` to feed in the data.
8+
9+
We also provide the `interface for Training and Inference <http://www.paddlepaddle.org/docs/develop/api/en/v2/run_logic.html>`_ to help control the training and inference phrase,
10+
it has several easy to use methods
11+
12+
- `paddle.train`
13+
- `paddle.test`
14+
- `paddle.infer`
15+
16+
to better expose the internal running details, different `events <http://www.paddlepaddle.org/docs/develop/api/en/v2/run_logic.html#event>`_ are available to users by writing some callbacks.

‎doc/api/v2/fluid/data_feeder.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ data_feeder
88
DataFeeder
99
----------
1010

11-
.. autoclass:: paddle.v2.fluid.data_feeder.DataFeeder
11+
.. autoclass:: paddle.fluid.data_feeder.DataFeeder
1212
:members:
1313
:noindex:
1414

‎doc/api/v2/fluid/evaluator.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ evaluator
88
Accuracy
99
--------
1010

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

1515
ChunkEvaluator
1616
--------------
1717

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

‎doc/api/v2/fluid/executor.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ executor
88
Executor
99
--------
1010

11-
.. autoclass:: paddle.v2.fluid.executor.Executor
11+
.. autoclass:: paddle.fluid.executor.Executor
1212
:members:
1313
:noindex:
1414

1515
global_scope
1616
------------
1717

18-
.. autofunction:: paddle.v2.fluid.executor.global_scope
18+
.. autofunction:: paddle.fluid.executor.global_scope
1919
:noindex:
2020

2121
scope_guard
2222
-----------
2323

24-
.. autofunction:: paddle.v2.fluid.executor.scope_guard
24+
.. autofunction:: paddle.fluid.executor.scope_guard
2525
:noindex:
2626

2727
switch_scope
2828
------------
2929

30-
.. autofunction:: paddle.v2.fluid.executor.switch_scope
30+
.. autofunction:: paddle.fluid.executor.switch_scope
3131
:noindex:
3232

‎doc/api/v2/fluid/gen_doc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import types
1919

20-
import paddle.v2.fluid as fluid
20+
import paddle.fluid as fluid
2121

2222

2323
def parse_arg():
@@ -70,15 +70,15 @@ def print_item(self, name):
7070

7171
def print_class(self, name):
7272
self._print_header_(name, dot='-', is_title=False)
73-
self.stream.write('''.. autoclass:: paddle.v2.fluid.{0}.{1}
73+
self.stream.write('''.. autoclass:: paddle.fluid.{0}.{1}
7474
:members:
7575
:noindex:
7676
7777
'''.format(self.module_name, name))
7878

7979
def print_method(self, name):
8080
self._print_header_(name, dot='-', is_title=False)
81-
self.stream.write('''.. autofunction:: paddle.v2.fluid.{0}.{1}
81+
self.stream.write('''.. autofunction:: paddle.fluid.{0}.{1}
8282
:noindex:
8383
8484
'''.format(self.module_name, name))

‎doc/api/v2/fluid/initializer.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ initializer
88
Constant
99
--------
1010

11-
.. autoclass:: paddle.v2.fluid.initializer.Constant
11+
.. autoclass:: paddle.fluid.initializer.Constant
1212
:members:
1313
:noindex:
1414

1515
Uniform
1616
-------
1717

18-
.. autoclass:: paddle.v2.fluid.initializer.Uniform
18+
.. autoclass:: paddle.fluid.initializer.Uniform
1919
:members:
2020
:noindex:
2121

2222
Normal
2323
------
2424

25-
.. autoclass:: paddle.v2.fluid.initializer.Normal
25+
.. autoclass:: paddle.fluid.initializer.Normal
2626
:members:
2727
:noindex:
2828

2929
Xavier
3030
------
3131

32-
.. autoclass:: paddle.v2.fluid.initializer.Xavier
32+
.. autoclass:: paddle.fluid.initializer.Xavier
3333
:members:
3434
:noindex:
3535

‎doc/api/v2/fluid/io.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,54 @@ io
88
save_vars
99
---------
1010

11-
.. autofunction:: paddle.v2.fluid.io.save_vars
11+
.. autofunction:: paddle.fluid.io.save_vars
1212
:noindex:
1313

1414
save_params
1515
-----------
1616

17-
.. autofunction:: paddle.v2.fluid.io.save_params
17+
.. autofunction:: paddle.fluid.io.save_params
1818
:noindex:
1919

2020
save_persistables
2121
-----------------
2222

23-
.. autofunction:: paddle.v2.fluid.io.save_persistables
23+
.. autofunction:: paddle.fluid.io.save_persistables
2424
:noindex:
2525

2626
load_vars
2727
---------
2828

29-
.. autofunction:: paddle.v2.fluid.io.load_vars
29+
.. autofunction:: paddle.fluid.io.load_vars
3030
:noindex:
3131

3232
load_params
3333
-----------
3434

35-
.. autofunction:: paddle.v2.fluid.io.load_params
35+
.. autofunction:: paddle.fluid.io.load_params
3636
:noindex:
3737

3838
load_persistables
3939
-----------------
4040

41-
.. autofunction:: paddle.v2.fluid.io.load_persistables
41+
.. autofunction:: paddle.fluid.io.load_persistables
4242
:noindex:
4343

4444
save_inference_model
4545
--------------------
4646

47-
.. autofunction:: paddle.v2.fluid.io.save_inference_model
47+
.. autofunction:: paddle.fluid.io.save_inference_model
4848
:noindex:
4949

5050
load_inference_model
5151
--------------------
5252

53-
.. autofunction:: paddle.v2.fluid.io.load_inference_model
53+
.. autofunction:: paddle.fluid.io.load_inference_model
5454
:noindex:
5555

5656
get_inference_program
5757
---------------------
5858

59-
.. autofunction:: paddle.v2.fluid.io.get_inference_program
59+
.. autofunction:: paddle.fluid.io.get_inference_program
6060
:noindex:
6161

0 commit comments

Comments
 (0)