From 243b43261a8fa0ebff5284e22b5867480e0a6764 Mon Sep 17 00:00:00 2001
From: zhiboniu <31800336+zhiboniu@users.noreply.github.com>
Date: Thu, 29 Apr 2021 08:38:52 +0800
Subject: [PATCH] update 2.0 public api in hapi (#32650)

---
 python/paddle/hapi/__init__.py      | 19 +++++++++----------
 python/paddle/hapi/dynamic_flops.py |  2 +-
 python/paddle/hapi/hub.py           |  2 ++
 python/paddle/hapi/logger.py        |  2 ++
 python/paddle/hapi/model.py         |  2 +-
 python/paddle/hapi/model_summary.py |  2 +-
 python/paddle/hapi/progressbar.py   |  2 +-
 python/paddle/hapi/static_flops.py  |  2 ++
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/python/paddle/hapi/__init__.py b/python/paddle/hapi/__init__.py
index 6b7672828e6..2829bbe9470 100644
--- a/python/paddle/hapi/__init__.py
+++ b/python/paddle/hapi/__init__.py
@@ -12,17 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from . import logger
-from . import callbacks
-from . import model_summary
-from . import hub
+from . import logger  # noqa: F401
+from . import callbacks  # noqa: F401
+from . import hub  # noqa: F401
+from . import progressbar  # noqa: F401
+from . import static_flops  # noqa: F401
 
-from . import model
-from .model import *
-from .model_summary import summary
-from .dynamic_flops import flops
+from .model import Model  # noqa: F401
+from .model_summary import summary  # noqa: F401
+from .dynamic_flops import flops  # noqa: F401
 
 logger.setup_logger()
 
-__all__ = ['callbacks'] + model.__all__ + ['summary']
-__all__ = model.__all__ + ['flops']
+__all__ = []
diff --git a/python/paddle/hapi/dynamic_flops.py b/python/paddle/hapi/dynamic_flops.py
index 35819d6b7bb..8be6758f1e5 100644
--- a/python/paddle/hapi/dynamic_flops.py
+++ b/python/paddle/hapi/dynamic_flops.py
@@ -18,7 +18,7 @@ import paddle.nn as nn
 import numpy as np
 from .static_flops import static_flops, Table
 
-__all__ = ['flops']
+__all__ = []
 
 
 def flops(net, input_size, custom_ops=None, print_detail=False):
diff --git a/python/paddle/hapi/hub.py b/python/paddle/hapi/hub.py
index 31a8be0944f..6490c878f9b 100644
--- a/python/paddle/hapi/hub.py
+++ b/python/paddle/hapi/hub.py
@@ -19,6 +19,8 @@ import shutil
 import zipfile
 from paddle.utils.download import get_path_from_url
 
+__all__ = []
+
 DEFAULT_CACHE_DIR = '~/.cache'
 VAR_DEPENDENCY = 'dependencies'
 MODULE_HUBCONF = 'hubconf.py'
diff --git a/python/paddle/hapi/logger.py b/python/paddle/hapi/logger.py
index d4f18ce0ff7..ea515d95324 100644
--- a/python/paddle/hapi/logger.py
+++ b/python/paddle/hapi/logger.py
@@ -22,6 +22,8 @@ import logging
 
 from paddle.fluid.dygraph.parallel import ParallelEnv
 
+__all__ = []
+
 
 def setup_logger(output=None, name="hapi", log_level=logging.INFO):
     """
diff --git a/python/paddle/hapi/model.py b/python/paddle/hapi/model.py
index 5a33d5b58dc..160d6c54759 100644
--- a/python/paddle/hapi/model.py
+++ b/python/paddle/hapi/model.py
@@ -54,7 +54,7 @@ from paddle.distributed.fleet.base import role_maker
 from .callbacks import config_callbacks, EarlyStopping
 from .model_summary import summary
 
-__all__ = ['Model', ]
+__all__ = []
 
 _parallel_context_initialized = False
 
diff --git a/python/paddle/hapi/model_summary.py b/python/paddle/hapi/model_summary.py
index 9f2769e1ca2..d78196d9445 100644
--- a/python/paddle/hapi/model_summary.py
+++ b/python/paddle/hapi/model_summary.py
@@ -22,7 +22,7 @@ from paddle.static import InputSpec
 
 from collections import OrderedDict
 
-__all__ = ['summary']
+__all__ = []
 
 
 def summary(net, input_size, dtypes=None):
diff --git a/python/paddle/hapi/progressbar.py b/python/paddle/hapi/progressbar.py
index cf5a03ed498..5f63a3169f8 100644
--- a/python/paddle/hapi/progressbar.py
+++ b/python/paddle/hapi/progressbar.py
@@ -22,7 +22,7 @@ import time
 import numpy as np
 from collections import namedtuple
 
-__all__ = ['ProgressBar']
+__all__ = []
 
 
 class ProgressBar(object):
diff --git a/python/paddle/hapi/static_flops.py b/python/paddle/hapi/static_flops.py
index 3656e0c1894..07fc19b2cb8 100644
--- a/python/paddle/hapi/static_flops.py
+++ b/python/paddle/hapi/static_flops.py
@@ -18,6 +18,8 @@ import paddle
 from collections import OrderedDict
 from paddle.static import Program, program_guard, Variable
 
+__all__ = []
+
 
 class VarWrapper(object):
     def __init__(self, var, graph):
-- 
GitLab