From ecc4dc6d9b741d23c5b81665a7ba49a9e71459b1 Mon Sep 17 00:00:00 2001
From: yuyang <yuyang18@baidu.com>
Date: Mon, 17 Sep 2018 06:35:25 +0000
Subject: [PATCH] Hide RecordIO Reader

---
 doc/fluid/api/layers.rst                                  | 8 --------
 python/paddle/fluid/layers/io.py                          | 5 ++---
 .../fluid/tests/unittests/test_multi_pass_reader.py       | 3 ++-
 python/paddle/fluid/tests/unittests/test_preprocessor.py  | 5 +++--
 .../paddle/fluid/tests/unittests/test_recordio_reader.py  | 3 ++-
 python/paddle/fluid/tests/unittests/transformer_model.py  | 3 ++-
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/doc/fluid/api/layers.rst b/doc/fluid/api/layers.rst
index 6f0267cd7a..39f8940514 100644
--- a/doc/fluid/api/layers.rst
+++ b/doc/fluid/api/layers.rst
@@ -290,14 +290,6 @@ Recv
 ..  autofunction:: paddle.fluid.layers.Recv
     :noindex:
 
-.. _api_fluid_layers_open_recordio_file:
-
-open_recordio_file
-------------------
-
-..  autofunction:: paddle.fluid.layers.open_recordio_file
-    :noindex:
-
 .. _api_fluid_layers_open_files:
 
 open_files
diff --git a/python/paddle/fluid/layers/io.py b/python/paddle/fluid/layers/io.py
index 0cf7aaef4a..e09e009f96 100644
--- a/python/paddle/fluid/layers/io.py
+++ b/python/paddle/fluid/layers/io.py
@@ -29,9 +29,8 @@ from ..layer_helper import LayerHelper
 from ..unique_name import generate as unique_name
 
 __all__ = [
-    'data', 'open_recordio_file', 'open_files', 'read_file', 'shuffle', 'batch',
-    'double_buffer', 'random_data_generator', 'py_reader', 'Preprocessor',
-    'load'
+    'data', 'open_files', 'read_file', 'shuffle', 'batch', 'double_buffer',
+    'random_data_generator', 'py_reader', 'Preprocessor', 'load'
 ]
 
 
diff --git a/python/paddle/fluid/tests/unittests/test_multi_pass_reader.py b/python/paddle/fluid/tests/unittests/test_multi_pass_reader.py
index 4fae11e928..8835b6995e 100644
--- a/python/paddle/fluid/tests/unittests/test_multi_pass_reader.py
+++ b/python/paddle/fluid/tests/unittests/test_multi_pass_reader.py
@@ -19,6 +19,7 @@ import unittest
 import paddle.fluid as fluid
 import paddle
 import paddle.dataset.mnist as mnist
+from paddle.fluid.layers.io import open_recordio_file
 
 
 class TestMultipleReader(unittest.TestCase):
@@ -41,7 +42,7 @@ class TestMultipleReader(unittest.TestCase):
 
     def test_main(self):
         with fluid.program_guard(fluid.Program(), fluid.Program()):
-            data_file = fluid.layers.open_recordio_file(
+            data_file = open_recordio_file(
                 filename='./mnist.recordio',
                 shapes=[(-1, 784), (-1, 1)],
                 lod_levels=[0, 0],
diff --git a/python/paddle/fluid/tests/unittests/test_preprocessor.py b/python/paddle/fluid/tests/unittests/test_preprocessor.py
index 98e609b769..0f0bdfc44a 100644
--- a/python/paddle/fluid/tests/unittests/test_preprocessor.py
+++ b/python/paddle/fluid/tests/unittests/test_preprocessor.py
@@ -20,6 +20,7 @@ import numpy as np
 import paddle
 import paddle.fluid as fluid
 import paddle.dataset.mnist as mnist
+from paddle.fluid.layers.io import open_recordio_file
 
 
 class TestPreprocessor(unittest.TestCase):
@@ -43,7 +44,7 @@ class TestPreprocessor(unittest.TestCase):
         img_expected_res = []
         lbl_expected_res = []
         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',
                 shapes=[[-1, 784], [-1, 1]],
                 lod_levels=[0, 0],
@@ -64,7 +65,7 @@ class TestPreprocessor(unittest.TestCase):
         img_actual_res = []
         lbl_actual_res = []
         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',
                 shapes=[[-1, 784], [-1, 1]],
                 lod_levels=[0, 0],
diff --git a/python/paddle/fluid/tests/unittests/test_recordio_reader.py b/python/paddle/fluid/tests/unittests/test_recordio_reader.py
index c5210bb208..f5009556ad 100644
--- a/python/paddle/fluid/tests/unittests/test_recordio_reader.py
+++ b/python/paddle/fluid/tests/unittests/test_recordio_reader.py
@@ -19,6 +19,7 @@ import unittest
 import paddle.fluid as fluid
 import paddle
 import paddle.dataset.mnist as mnist
+from paddle.fluid.layers.io import open_recordio_file
 
 
 class TestRecordIO(unittest.TestCase):
@@ -40,7 +41,7 @@ class TestRecordIO(unittest.TestCase):
     def test_main(self, decorator_callback=None):
         # use new program
         with fluid.program_guard(fluid.Program(), fluid.Program()):
-            data_file = fluid.layers.open_recordio_file(
+            data_file = open_recordio_file(
                 './mnist.recordio',
                 shapes=[[-1, 784], [-1, 1]],
                 lod_levels=[0, 0],
diff --git a/python/paddle/fluid/tests/unittests/transformer_model.py b/python/paddle/fluid/tests/unittests/transformer_model.py
index f0e74aff6b..ab7a18d4c5 100644
--- a/python/paddle/fluid/tests/unittests/transformer_model.py
+++ b/python/paddle/fluid/tests/unittests/transformer_model.py
@@ -19,6 +19,7 @@ import numpy as np
 
 import paddle.fluid as fluid
 import paddle.fluid.layers as layers
+from paddle.fluid.layers.io import open_recordio_file
 
 pos_enc_param_names = (
     "src_pos_enc_table",
@@ -405,7 +406,7 @@ def transformer(
         src_pad_idx,
         trg_pad_idx,
         pos_pad_idx, ):
-    file_obj = fluid.layers.open_recordio_file(
+    file_obj = open_recordio_file(
         filename='/tmp/wmt16.recordio',
         shapes=[
             [batch_size * max_length, 1],
-- 
GitLab