Skip to content

Commit f8df9eb

Browse files
sneaxiyshanyi15
authored andcommitted
fix api doc (#16201)
test=develop
1 parent 13816dd commit f8df9eb

File tree

6 files changed

+52
-41
lines changed

6 files changed

+52
-41
lines changed

paddle/fluid/API.spec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ paddle.fluid.program_guard (ArgSpec(args=['main_program', 'startup_program'], va
1212
paddle.fluid.name_scope (ArgSpec(args=['prefix'], varargs=None, keywords=None, defaults=(None,)), ('document', '0ef753f5cec69fef9ae6ad8b867b33a2'))
1313
paddle.fluid.Executor.__init__ (ArgSpec(args=['self', 'place'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
1414
paddle.fluid.Executor.close (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', 'f5369953dd0c443961cf79f7a00e1a03'))
15-
paddle.fluid.Executor.run (ArgSpec(args=['self', 'program', 'feed', 'fetch_list', 'feed_var_name', 'fetch_var_name', 'scope', 'return_numpy', 'use_program_cache'], varargs=None, keywords=None, defaults=(None, None, None, 'feed', 'fetch', None, True, False)), ('document', 'aba8093edebf2d5c869b735b92811e45'))
15+
paddle.fluid.Executor.run (ArgSpec(args=['self', 'program', 'feed', 'fetch_list', 'feed_var_name', 'fetch_var_name', 'scope', 'return_numpy', 'use_program_cache'], varargs=None, keywords=None, defaults=(None, None, None, 'feed', 'fetch', None, True, False)), ('document', 'f482e93b38b4018796969a2e1dde479d'))
1616
paddle.fluid.global_scope (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', 'e148d3ab1ed8edf3e928212a375959c0'))
1717
paddle.fluid.scope_guard (ArgSpec(args=['scope'], varargs=None, keywords=None, defaults=None), ('document', 'b94d1f6bcc29c4fb58fc0058561250c2'))
1818
paddle.fluid.DistributeTranspiler.__init__ (ArgSpec(args=['self', 'config'], varargs=None, keywords=None, defaults=(None,)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
@@ -494,7 +494,7 @@ paddle.fluid.CUDAPinnedPlace.__init__ __init__(self: paddle.fluid.core.CUDAPinne
494494
paddle.fluid.ParamAttr.__init__ (ArgSpec(args=['self', 'name', 'initializer', 'learning_rate', 'regularizer', 'trainable', 'gradient_clip', 'do_model_average'], varargs=None, keywords=None, defaults=(None, None, 1.0, None, True, None, False)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
495495
paddle.fluid.WeightNormParamAttr.__init__ (ArgSpec(args=['self', 'dim', 'name', 'initializer', 'learning_rate', 'regularizer', 'trainable', 'gradient_clip', 'do_model_average'], varargs=None, keywords=None, defaults=(None, None, None, 1.0, None, True, None, False)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
496496
paddle.fluid.DataFeeder.__init__ (ArgSpec(args=['self', 'feed_list', 'place', 'program'], varargs=None, keywords=None, defaults=(None,)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
497-
paddle.fluid.DataFeeder.decorate_reader (ArgSpec(args=['self', 'reader', 'multi_devices', 'num_places', 'drop_last'], varargs=None, keywords=None, defaults=(None, True)), ('document', '0eed2f198dc73c08a41b61edbc755753'))
497+
paddle.fluid.DataFeeder.decorate_reader (ArgSpec(args=['self', 'reader', 'multi_devices', 'num_places', 'drop_last'], varargs=None, keywords=None, defaults=(None, True)), ('document', 'f8f3df23c5633c614db781a91b81fb62'))
498498
paddle.fluid.DataFeeder.feed (ArgSpec(args=['self', 'iterable'], varargs=None, keywords=None, defaults=None), ('document', '459e316301279dfd82001b46f0b8ffca'))
499499
paddle.fluid.DataFeeder.feed_parallel (ArgSpec(args=['self', 'iterable', 'num_places'], varargs=None, keywords=None, defaults=(None,)), ('document', '543863d1f9d4853758adb613b8659e85'))
500500
paddle.fluid.clip.ErrorClipByValue.__init__ (ArgSpec(args=['self', 'max', 'min'], varargs=None, keywords=None, defaults=(None,)), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
@@ -518,11 +518,11 @@ paddle.reader.compose (ArgSpec(args=[], varargs='readers', keywords='kwargs', de
518518
paddle.reader.chain (ArgSpec(args=[], varargs='readers', keywords=None, defaults=None), ('document', 'd22c34e379a53901ae67a6bca7f4def4'))
519519
paddle.reader.shuffle (ArgSpec(args=['reader', 'buf_size'], varargs=None, keywords=None, defaults=None), ('document', 'e42ea6fee23ce26b23cb142cd1d6522d'))
520520
paddle.reader.firstn (ArgSpec(args=['reader', 'n'], varargs=None, keywords=None, defaults=None), ('document', 'c5bb8f7dd4f917f1569a368aab5b8aad'))
521-
paddle.reader.xmap_readers (ArgSpec(args=['mapper', 'reader', 'process_num', 'buffer_size', 'order'], varargs=None, keywords=None, defaults=(False,)), ('document', '283bc0b8a0e26ae186b8b9bee4aec560'))
521+
paddle.reader.xmap_readers (ArgSpec(args=['mapper', 'reader', 'process_num', 'buffer_size', 'order'], varargs=None, keywords=None, defaults=(False,)), ('document', '9c804a42f8a4dbaa76b3c98e0ab7f796'))
522522
paddle.reader.PipeReader.__init__ (ArgSpec(args=['self', 'command', 'bufsize', 'file_type'], varargs=None, keywords=None, defaults=(8192, 'plain')), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
523-
paddle.reader.PipeReader.get_line (ArgSpec(args=['self', 'cut_lines', 'line_break'], varargs=None, keywords=None, defaults=(True, '\n')), ('document', '5f80a7ed70052f01665e4c74acccfa69'))
523+
paddle.reader.PipeReader.get_line (ArgSpec(args=['self', 'cut_lines', 'line_break'], varargs=None, keywords=None, defaults=(True, '\n')), ('document', '9621ae612e595b6c34eb3bb5f3eb1a45'))
524524
paddle.reader.multiprocess_reader (ArgSpec(args=['readers', 'use_pipe', 'queue_size'], varargs=None, keywords=None, defaults=(True, 1000)), ('document', '7d8b3a96e592107c893d5d51ce968ba0'))
525525
paddle.reader.Fake.__init__ (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754'))
526526
paddle.reader.creator.np_array (ArgSpec(args=['x'], varargs=None, keywords=None, defaults=None), ('document', '28d457fbc9a71efa4ac91a3be179cada'))
527-
paddle.reader.creator.text_file (ArgSpec(args=['path'], varargs=None, keywords=None, defaults=None), ('document', '44fe286ab6175a5464d3a961a68c266a'))
528-
paddle.reader.creator.recordio (ArgSpec(args=['paths', 'buf_size'], varargs=None, keywords=None, defaults=(100,)), ('document', '11b3704ea42cfd537953387a7e58dae8'))
527+
paddle.reader.creator.text_file (ArgSpec(args=['path'], varargs=None, keywords=None, defaults=None), ('document', 'f45fcb7add066c8e042c6774fc7c3db2'))
528+
paddle.reader.creator.recordio (ArgSpec(args=['paths', 'buf_size'], varargs=None, keywords=None, defaults=(100,)), ('document', 'b4a94ee0e2cefb495619275c2f8c61d2'))

python/paddle/fluid/data_feeder.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ def decorate_reader(self,
268268
Args:
269269
reader(function): the reader is the function which can generate data.
270270
multi_devices(bool): whether to use multiple devices or not.
271-
num_places(int): if the multi_devices is True, you can specify the number
272-
of GPU to use, if 'num_places' is None, the function will use all the
271+
num_places(int): if multi_devices is True, you can specify the number
272+
of GPU to use, if multi_devices is None, the function will use all the
273273
GPU of the current machine. Default None.
274274
drop_last(bool): whether to drop the last batch if the
275275
size of the last batch is less than batch_size. Default True.
@@ -278,7 +278,7 @@ def decorate_reader(self,
278278
dict: the result of conversion.
279279
280280
Raises:
281-
ValueError: If drop_last is False and the data batch which cannot fit for devices.
281+
ValueError: If drop_last is False and the data batch cannot fit for devices.
282282
"""
283283

284284
def __reader_creator__():

python/paddle/fluid/executor.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,13 +470,21 @@ def run(self,
470470
program(Program|CompiledProgram): the program that need to run,
471471
if not provided, then default_main_program (not compiled) will be used.
472472
feed(dict): feed variable map, e.g. {"image": ImageData, "label": LabelData}
473-
fetch_list(list): a list of variable or variable names that user want to get, run will return them according to this list.
474-
feed_var_name(str): the name for the input variable of feed Operator.
475-
fetch_var_name(str): the name for the output variable of fetch Operator.
476-
scope(Scope): the scope used to run this program, you can switch it to different scope. default is global_scope
473+
fetch_list(list): a list of variable or variable names that user
474+
wants to get, this method will return them according to this list.
475+
feed_var_name(str): the name for the input variable of
476+
feed Operator.
477+
fetch_var_name(str): the name for the output variable of
478+
fetch Operator.
479+
scope(Scope): the scope used to run this program, you can switch
480+
it to different scope. default is global_scope
477481
return_numpy(bool): if convert the fetched tensor to numpy
478-
use_program_cache(bool): set use_program_cache to true if program not changed compare to the last step.
479-
482+
use_program_cache(bool): whether to use the cached program
483+
settings across batches. Setting it be true would be faster
484+
only when (1) the program is not compiled with data parallel,
485+
and (2) program, feed variable names and fetch_list variable
486+
names do not changed compared to the last step.
487+
480488
Returns:
481489
482490
list(numpy.array): fetch result according to fetch_list.

python/paddle/reader/__init__.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
Element produced from the iterable should be a **single** entry of data,
3939
**not** a mini batch. That entry of data could be a single item, or a tuple of
4040
items.
41-
Item should be of `supported type <http://www.paddlepaddle.org/doc/ui/data_provider
42-
/pydataprovider2.html?highlight=dense_vector#input-types>`_ (e.g., numpy 1d
43-
array of float32, int, list of int)
41+
Item should be of supported type (e.g., numpy array or list/tuple of float
42+
or int).
4443
4544
An example implementation for single item data reader creator:
4645
@@ -62,8 +61,6 @@ def reader():
6261
yield numpy.random.uniform(-1, 1, size=width*height), label
6362
return reader
6463
65-
66-
TODO(yuyang18): Should we add whole design doc here?
6764
"""
6865

6966
import paddle.reader.decorator

python/paddle/reader/creator.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ def text_file(path):
4444
Creates a data reader that outputs text line by line from given text file.
4545
Trailing new line ('\\\\n') of each line will be removed.
4646
47-
:path: path of the text file.
48-
:returns: data reader of text file
47+
Args:
48+
path (str): path of the text file.
49+
50+
Returns:
51+
callable: data reader of text file.
4952
"""
5053

5154
def reader():
@@ -59,10 +62,15 @@ def reader():
5962

6063
def recordio(paths, buf_size=100):
6164
"""
62-
Creates a data reader from given RecordIO file paths separated by ",",
63-
glob pattern is supported.
64-
:path: path of recordio files, can be a string or a string list.
65-
:returns: data reader of recordio files.
65+
Creates a data reader from given RecordIO file paths separated
66+
by ",", glob pattern is supported.
67+
68+
Args:
69+
paths (str|list(str)): path of recordio files.
70+
buf_size (int): prefetched buffer size.
71+
72+
Returns:
73+
callable: data reader of recordio files.
6674
"""
6775

6876
import recordio as rec

python/paddle/reader/decorator.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -242,20 +242,18 @@ class XmapEndSignal():
242242

243243
def xmap_readers(mapper, reader, process_num, buffer_size, order=False):
244244
"""
245-
Use multiprocess to map samples from reader by a mapper defined by user.
246-
And this function contains a buffered decorator.
247-
:param mapper: a function to map sample.
248-
:type mapper: callable
249-
:param reader: the data reader to read from
250-
:type reader: callable
251-
:param process_num: process number to handle original sample
252-
:type process_num: int
253-
:param buffer_size: max buffer size
254-
:type buffer_size: int
255-
:param order: keep the order of reader
256-
:type order: bool
257-
:return: the decarated reader
258-
:rtype: callable
245+
Use multi-threads to map samples from reader by a mapper defined by user.
246+
247+
Args:
248+
mapper (callable): a function to map the data from reader.
249+
reader (callable): a data reader which yields the data.
250+
process_num (int): thread number to handle original sample.
251+
buffer_size (int): size of the queue to read data in.
252+
order (bool): whether to keep the data order from original reader.
253+
Default False.
254+
255+
Returns:
256+
callable: a decorated reader with data mapping.
259257
"""
260258
end = XmapEndSignal()
261259

@@ -477,7 +475,7 @@ def get_line(self, cut_lines=True, line_break="\n"):
477475
"""
478476
:param cut_lines: cut buffer to lines
479477
:type cut_lines: bool
480-
:param line_break: line break of the file, like \n or \r
478+
:param line_break: line break of the file, like '\\\\n' or '\\\\r'
481479
:type line_break: string
482480
483481
:return: one line or a buffer of bytes

0 commit comments

Comments
 (0)