未验证 提交 93456fc6 编写于 作者: Y Yu Yang 提交者: GitHub

Merge pull request #13427 from reyoung/feature/hide_recordio_reader

Hide RecordIO Reader
...@@ -290,14 +290,6 @@ Recv ...@@ -290,14 +290,6 @@ Recv
.. autofunction:: paddle.fluid.layers.Recv .. autofunction:: paddle.fluid.layers.Recv
:noindex: :noindex:
.. _api_fluid_layers_open_recordio_file:
open_recordio_file
------------------
.. autofunction:: paddle.fluid.layers.open_recordio_file
:noindex:
.. _api_fluid_layers_open_files: .. _api_fluid_layers_open_files:
open_files open_files
......
...@@ -170,7 +170,6 @@ paddle.fluid.layers.unstack ArgSpec(args=['x', 'axis', 'num'], varargs=None, key ...@@ -170,7 +170,6 @@ paddle.fluid.layers.unstack ArgSpec(args=['x', 'axis', 'num'], varargs=None, key
paddle.fluid.layers.sequence_enumerate ArgSpec(args=['input', 'win_size', 'pad_value', 'name'], varargs=None, keywords=None, defaults=(0, None)) paddle.fluid.layers.sequence_enumerate ArgSpec(args=['input', 'win_size', 'pad_value', 'name'], varargs=None, keywords=None, defaults=(0, None))
paddle.fluid.layers.sequence_concat ArgSpec(args=['input', 'name'], varargs=None, keywords=None, defaults=(None,)) paddle.fluid.layers.sequence_concat ArgSpec(args=['input', 'name'], varargs=None, keywords=None, defaults=(None,))
paddle.fluid.layers.data ArgSpec(args=['name', 'shape', 'append_batch_size', 'dtype', 'lod_level', 'type', 'stop_gradient'], varargs=None, keywords=None, defaults=(True, 'float32', 0, VarType.LOD_TENSOR, True)) paddle.fluid.layers.data ArgSpec(args=['name', 'shape', 'append_batch_size', 'dtype', 'lod_level', 'type', 'stop_gradient'], varargs=None, keywords=None, defaults=(True, 'float32', 0, VarType.LOD_TENSOR, True))
paddle.fluid.layers.open_recordio_file ArgSpec(args=['filename', 'shapes', 'lod_levels', 'dtypes', 'pass_num', 'for_parallel'], varargs=None, keywords=None, defaults=(1, True))
paddle.fluid.layers.open_files ArgSpec(args=['filenames', 'shapes', 'lod_levels', 'dtypes', 'thread_num', 'buffer_size', 'pass_num', 'is_test'], varargs=None, keywords=None, defaults=(None, None, 1, None)) paddle.fluid.layers.open_files ArgSpec(args=['filenames', 'shapes', 'lod_levels', 'dtypes', 'thread_num', 'buffer_size', 'pass_num', 'is_test'], varargs=None, keywords=None, defaults=(None, None, 1, None))
paddle.fluid.layers.read_file ArgSpec(args=['reader'], varargs=None, keywords=None, defaults=None) paddle.fluid.layers.read_file ArgSpec(args=['reader'], varargs=None, keywords=None, defaults=None)
paddle.fluid.layers.shuffle ArgSpec(args=['reader', 'buffer_size'], varargs=None, keywords=None, defaults=None) paddle.fluid.layers.shuffle ArgSpec(args=['reader', 'buffer_size'], varargs=None, keywords=None, defaults=None)
......
...@@ -29,9 +29,8 @@ from ..layer_helper import LayerHelper ...@@ -29,9 +29,8 @@ from ..layer_helper import LayerHelper
from ..unique_name import generate as unique_name from ..unique_name import generate as unique_name
__all__ = [ __all__ = [
'data', 'open_recordio_file', 'open_files', 'read_file', 'shuffle', 'batch', 'data', 'open_files', 'read_file', 'shuffle', 'batch', 'double_buffer',
'double_buffer', 'random_data_generator', 'py_reader', 'Preprocessor', 'random_data_generator', 'py_reader', 'Preprocessor', 'load'
'load'
] ]
......
...@@ -19,6 +19,7 @@ import unittest ...@@ -19,6 +19,7 @@ import unittest
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle import paddle
import paddle.dataset.mnist as mnist import paddle.dataset.mnist as mnist
from paddle.fluid.layers.io import open_recordio_file
class TestMultipleReader(unittest.TestCase): class TestMultipleReader(unittest.TestCase):
...@@ -41,7 +42,7 @@ class TestMultipleReader(unittest.TestCase): ...@@ -41,7 +42,7 @@ class TestMultipleReader(unittest.TestCase):
def test_main(self): def test_main(self):
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
data_file = fluid.layers.open_recordio_file( data_file = open_recordio_file(
filename='./mnist.recordio', filename='./mnist.recordio',
shapes=[(-1, 784), (-1, 1)], shapes=[(-1, 784), (-1, 1)],
lod_levels=[0, 0], lod_levels=[0, 0],
......
...@@ -20,6 +20,7 @@ import numpy as np ...@@ -20,6 +20,7 @@ import numpy as np
import paddle import paddle
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.dataset.mnist as mnist import paddle.dataset.mnist as mnist
from paddle.fluid.layers.io import open_recordio_file
class TestPreprocessor(unittest.TestCase): class TestPreprocessor(unittest.TestCase):
...@@ -43,7 +44,7 @@ class TestPreprocessor(unittest.TestCase): ...@@ -43,7 +44,7 @@ class TestPreprocessor(unittest.TestCase):
img_expected_res = [] img_expected_res = []
lbl_expected_res = [] lbl_expected_res = []
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
data_file = fluid.layers.io.open_recordio_file( data_file = open_recordio_file(
'./mnist_for_preprocessor_test.recordio', './mnist_for_preprocessor_test.recordio',
shapes=[[-1, 784], [-1, 1]], shapes=[[-1, 784], [-1, 1]],
lod_levels=[0, 0], lod_levels=[0, 0],
...@@ -64,7 +65,7 @@ class TestPreprocessor(unittest.TestCase): ...@@ -64,7 +65,7 @@ class TestPreprocessor(unittest.TestCase):
img_actual_res = [] img_actual_res = []
lbl_actual_res = [] lbl_actual_res = []
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
data_file = fluid.layers.io.open_recordio_file( data_file = open_recordio_file(
'./mnist_for_preprocessor_test.recordio', './mnist_for_preprocessor_test.recordio',
shapes=[[-1, 784], [-1, 1]], shapes=[[-1, 784], [-1, 1]],
lod_levels=[0, 0], lod_levels=[0, 0],
......
...@@ -19,6 +19,7 @@ import unittest ...@@ -19,6 +19,7 @@ import unittest
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle import paddle
import paddle.dataset.mnist as mnist import paddle.dataset.mnist as mnist
from paddle.fluid.layers.io import open_recordio_file
class TestRecordIO(unittest.TestCase): class TestRecordIO(unittest.TestCase):
...@@ -40,7 +41,7 @@ class TestRecordIO(unittest.TestCase): ...@@ -40,7 +41,7 @@ class TestRecordIO(unittest.TestCase):
def test_main(self, decorator_callback=None): def test_main(self, decorator_callback=None):
# use new program # use new program
with fluid.program_guard(fluid.Program(), fluid.Program()): with fluid.program_guard(fluid.Program(), fluid.Program()):
data_file = fluid.layers.open_recordio_file( data_file = open_recordio_file(
'./mnist.recordio', './mnist.recordio',
shapes=[[-1, 784], [-1, 1]], shapes=[[-1, 784], [-1, 1]],
lod_levels=[0, 0], lod_levels=[0, 0],
......
...@@ -19,6 +19,7 @@ import numpy as np ...@@ -19,6 +19,7 @@ import numpy as np
import paddle.fluid as fluid import paddle.fluid as fluid
import paddle.fluid.layers as layers import paddle.fluid.layers as layers
from paddle.fluid.layers.io import open_recordio_file
pos_enc_param_names = ( pos_enc_param_names = (
"src_pos_enc_table", "src_pos_enc_table",
...@@ -405,7 +406,7 @@ def transformer( ...@@ -405,7 +406,7 @@ def transformer(
src_pad_idx, src_pad_idx,
trg_pad_idx, trg_pad_idx,
pos_pad_idx, ): pos_pad_idx, ):
file_obj = fluid.layers.open_recordio_file( file_obj = open_recordio_file(
filename='/tmp/wmt16.recordio', filename='/tmp/wmt16.recordio',
shapes=[ shapes=[
[batch_size * max_length, 1], [batch_size * max_length, 1],
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册