Skip to content

Commit 0690a9f

Browse files
committed
add v2 run logic doc
1 parent c36bf19 commit 0690a9f

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

doc/api/v2/run_logic.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,26 @@ Parameters
66
==========
77

88
.. automodule:: paddle.v2.parameters
9+
:members: Parameters
910
:noindex:
1011

1112
Trainer
1213
=======
1314

1415
.. automodule:: paddle.v2.trainer
16+
:members: Trainer
1517
:noindex:
1618

1719
Event
1820
=====
1921

2022
.. automodule:: paddle.v2.event
23+
:members: Event
2124
:noindex:
2225

2326
Inference
2427
=========
2528

2629
.. autofunction:: paddle.v2.infer
30+
:members: Inference
2731
:noindex:

python/paddle/v2/inference.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99

1010

1111
class Inference(object):
12+
"""
13+
Inference combines neural network output and parameters together
14+
to do inference.
15+
16+
:param outptut_layer: The neural network that should be inferenced.
17+
:type output_layer: paddle.v2.config_base.Layer or the sequence
18+
of paddle.v2.config_base.Layer
19+
:param parameters: The parameters dictionary.
20+
:type parameters: paddle.v2.parameters.Parameters
21+
"""
1222
def __init__(self, output_layer, parameters):
1323
topo = topology.Topology(output_layer)
1424
gm = api.GradientMachine.createFromConfigProto(
@@ -39,7 +49,7 @@ def __reader_impl__():
3949
def iter_infer_field(self, field, **kwargs):
4050
for result in self.iter_infer(**kwargs):
4151
yield [each_result[field] for each_result in result]
42-
52+
4353
def infer(self, field='value', **kwargs):
4454
retv = None
4555
for result in self.iter_infer_field(field=field, **kwargs):

python/paddle/v2/trainer.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ def default_event_handler(event):
2929
class SGD(object):
3030
"""
3131
Simple SGD Trainer.
32-
TODO(yuyang18): Complete comments
32+
SGD Trainer combines data reader, network topolopy and update_equation together
33+
to train/test a neural network.
3334
3435
:param update_equation: The optimizer object.
3536
:type update_equation: paddle.v2.optimizer.Optimizer
@@ -65,7 +66,9 @@ def train(self, reader, num_passes=1, event_handler=None, feeding=None):
6566
"""
6667
Training method. Will train num_passes of input data.
6768
68-
:param reader:
69+
:param reader: A reader that reads and yeilds data items. Usually we use a
70+
batched reader to do mini-batch training.
71+
:type reader: collections.Iterable
6972
:param num_passes: The total train passes.
7073
:param event_handler: Event handler. A method will be invoked when event
7174
occurred.
@@ -123,6 +126,16 @@ def train(self, reader, num_passes=1, event_handler=None, feeding=None):
123126
self.__gradient_machine__.finish()
124127

125128
def test(self, reader, feeding=None):
129+
"""
130+
Testing method. Will test input data.
131+
132+
:param reader: A reader that reads and yeilds data items.
133+
:type reader: collections.Iterable
134+
:param feeding: Feeding is a map of neural network input name and array
135+
index that reader returns.
136+
:type feeding: dict
137+
:return:
138+
"""
126139
feeder = DataFeeder(self.__data_types__, feeding)
127140
evaluator = self.__gradient_machine__.makeEvaluator()
128141
out_args = api.Arguments.createArguments(0)

0 commit comments

Comments
 (0)