From 2ff41f53ab47e9998533487b91aaa5b300d68df7 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Fri, 15 Sep 2023 16:33:47 +0800 Subject: [PATCH 1/3] enable F403 --- pyproject.toml | 1 - python/paddle/base/__init__.py | 10 +++++----- python/paddle/base/core.py | 2 +- python/paddle/base/dygraph/__init__.py | 4 ++-- python/paddle/base/io.py | 2 +- python/paddle/base/layers/__init__.py | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index edc174738481b2..c5077a8c0b5079 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,7 +109,6 @@ ignore = [ "UP031", "C408", "UP030", - "F403", "F522", "B010", "PLR1722", diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index 07ca385e88baca..6eec276eee03d3 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -34,17 +34,17 @@ # import all class inside framework into base module from . import framework -from .framework import * +from .framework import * # noqa: F403 # import all class inside executor into base module from . import executor -from .executor import * +from .executor import * # noqa: F403 from . import data_feed_desc -from .data_feed_desc import * +from .data_feed_desc import * # noqa: F403 from . import dataset -from .dataset import * +from .dataset import * # noqa: F403 from . import trainer_desc @@ -72,7 +72,7 @@ from . import unique_name from . import compiler -from .compiler import * +from .compiler import * # noqa: F403 from paddle.base.layers.math_op_patch import monkey_patch_variable from .dygraph.base import enable_dygraph, disable_dygraph from .dygraph.tensor_patch_methods import monkey_patch_tensor diff --git a/python/paddle/base/core.py b/python/paddle/base/core.py index 720c3835fe1cf9..13bfe12b1c0c97 100644 --- a/python/paddle/base/core.py +++ b/python/paddle/base/core.py @@ -279,7 +279,7 @@ def to_list(s): # assign tensor alias libpaddle.LoDTensor = libpaddle.Tensor - from .libpaddle import * + from .libpaddle import * # noqa: F403 from .libpaddle import __doc__, __file__, __name__, __package__ from .libpaddle import __unittest_throw_exception__ from .libpaddle import _append_python_callable_object_and_return_id diff --git a/python/paddle/base/dygraph/__init__.py b/python/paddle/base/dygraph/__init__.py index 09cc385b948ed4..6355ca337b9f84 100644 --- a/python/paddle/base/dygraph/__init__.py +++ b/python/paddle/base/dygraph/__init__.py @@ -13,10 +13,10 @@ # limitations under the License. from . import base -from .base import * +from .base import * # noqa: F403 from . import tracer -from .tracer import * +from .tracer import * # noqa: F403 __all__ = [] diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index 80855333b91654..74ef5b47e0c233 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -54,7 +54,7 @@ from paddle.base.log_helper import get_logger from . import reader from . import unique_name -from .reader import * +from .reader import * # noqa: F403 from . import core from paddle.utils import deprecated from paddle.base.framework import static_only diff --git a/python/paddle/base/layers/__init__.py b/python/paddle/base/layers/__init__.py index 9c6ce9aed08923..44e34301609b80 100644 --- a/python/paddle/base/layers/__init__.py +++ b/python/paddle/base/layers/__init__.py @@ -13,9 +13,9 @@ # limitations under the License. from . import io -from .io import * +from .io import * # F403# noqa: F403 from . import math_op_patch -from .math_op_patch import * +from .math_op_patch import * # noqa: F403 from ..layer_helper import LayerHelper From 58b76c567940d037429d3a9cb4f08ccbf912f75c Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Sat, 16 Sep 2023 13:01:13 +0800 Subject: [PATCH 2/3] empty From 898edaf87e5be639b76f0e10a8dbb676ec3e0777 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Mon, 18 Sep 2023 14:14:42 +0800 Subject: [PATCH 3/3] try to fix paddle.base.layers.__init__.py --- python/paddle/base/layers/__init__.py | 3 --- python/paddle/nn/functional/pooling.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/python/paddle/base/layers/__init__.py b/python/paddle/base/layers/__init__.py index 44e34301609b80..60e0d1c922c750 100644 --- a/python/paddle/base/layers/__init__.py +++ b/python/paddle/base/layers/__init__.py @@ -13,10 +13,7 @@ # limitations under the License. from . import io -from .io import * # F403# noqa: F403 from . import math_op_patch -from .math_op_patch import * # noqa: F403 -from ..layer_helper import LayerHelper __all__ = [] diff --git a/python/paddle/nn/functional/pooling.py b/python/paddle/nn/functional/pooling.py index 2f4ac35cbb078e..2642996ddee778 100755 --- a/python/paddle/nn/functional/pooling.py +++ b/python/paddle/nn/functional/pooling.py @@ -18,7 +18,7 @@ from paddle.base.framework import Variable, in_dygraph_mode from ...base.data_feeder import check_type, check_variable_and_dtype -from ...base.layers import LayerHelper +from ...base.layer_helper import LayerHelper from ...tensor.manipulation import squeeze, unsqueeze # TODO: define pooling functions