From ab9d748e6e02bcd0352b58db300a6131329951ea Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 18:05:24 +0800 Subject: [PATCH 01/10] try to fix paddle.base.dygraph.__init__.py --- pyproject.toml | 2 -- python/paddle/base/core.py | 2 +- python/paddle/base/dygraph/__init__.py | 1 - python/paddle/base/io.py | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 45d96b8631b9db..02e8f0eca9df39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,8 +108,6 @@ ignore = [ "UP031", "C408", "UP030", - "F522", - "F403", "PLR1722", "C405", "C417", diff --git a/python/paddle/base/core.py b/python/paddle/base/core.py index df90a6ace8582d..285a9f1b1a61b9 100644 --- a/python/paddle/base/core.py +++ b/python/paddle/base/core.py @@ -278,7 +278,7 @@ def to_list(s): # assign tensor alias libpaddle.LoDTensor = libpaddle.Tensor - from .libpaddle import * + from .libpaddle import * # noqa: F403 from .libpaddle import ( # noqa: F401 __doc__, __file__, diff --git a/python/paddle/base/dygraph/__init__.py b/python/paddle/base/dygraph/__init__.py index 6355ca337b9f84..bba1d5a6485d50 100644 --- a/python/paddle/base/dygraph/__init__.py +++ b/python/paddle/base/dygraph/__init__.py @@ -16,7 +16,6 @@ from .base import * # noqa: F403 from . import tracer -from .tracer import * # noqa: F403 __all__ = [] diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index 89468f88648e81..ee723474da9516 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -16,7 +16,7 @@ from paddle.base.log_helper import get_logger from . import reader -from .reader import * +from .reader import * # noqa: F403 __all__ = reader.__all__ From 6f8e37a7f35f4f95c6c25c1072226a3bc9f6eaa4 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 18:39:53 +0800 Subject: [PATCH 02/10] fix --- python/paddle/base/dygraph/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/paddle/base/dygraph/__init__.py b/python/paddle/base/dygraph/__init__.py index bba1d5a6485d50..6355ca337b9f84 100644 --- a/python/paddle/base/dygraph/__init__.py +++ b/python/paddle/base/dygraph/__init__.py @@ -16,6 +16,7 @@ from .base import * # noqa: F403 from . import tracer +from .tracer import * # noqa: F403 __all__ = [] From 85d941885ba3292185d6b81c8f254db4da605e14 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 18:58:52 +0800 Subject: [PATCH 03/10] fix --- python/paddle/base/io.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index ee723474da9516..285474c723962c 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -16,7 +16,6 @@ from paddle.base.log_helper import get_logger from . import reader -from .reader import * # noqa: F403 __all__ = reader.__all__ From 492daacbab47193a27006a0a1718a967c8961131 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 19:25:32 +0800 Subject: [PATCH 04/10] try to fix paddle.base.__init__.py --- python/paddle/base/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index 6eec276eee03d3..572e7d24d7a33a 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -41,10 +41,8 @@ from .executor import * # noqa: F403 from . import data_feed_desc -from .data_feed_desc import * # noqa: F403 from . import dataset -from .dataset import * # noqa: F403 from . import trainer_desc @@ -72,7 +70,6 @@ from . import unique_name from . import compiler -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 From 70e91984e07fe3b59cec9361f9e682773d290b8f Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 20:27:08 +0800 Subject: [PATCH 05/10] fix --- python/paddle/base/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index 572e7d24d7a33a..c91645f4ed4cfb 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -70,6 +70,7 @@ from . import unique_name from . import compiler +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 From c7a2c7b9d66e97755a25f1d69ca1efddec74abe9 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Tue, 19 Sep 2023 21:33:47 +0800 Subject: [PATCH 06/10] add data_feed_desc --- python/paddle/base/__init__.py | 1 + python/paddle/base/io.py | 1 + 2 files changed, 2 insertions(+) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index c91645f4ed4cfb..4cc5603ab24b0d 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -41,6 +41,7 @@ from .executor import * # noqa: F403 from . import data_feed_desc +from .data_feed_desc import * # noqa: F403 from . import dataset diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index 285474c723962c..ee723474da9516 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -16,6 +16,7 @@ from paddle.base.log_helper import get_logger from . import reader +from .reader import * # noqa: F403 __all__ = reader.__all__ From f2b47bb8f5d431d184c5d5b00ff926b617ca0eb4 Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Wed, 20 Sep 2023 15:24:40 +0800 Subject: [PATCH 07/10] make a try --- python/paddle/base/__init__.py | 21 +++++++++++++++++---- python/paddle/base/dygraph/__init__.py | 9 +++++++-- python/paddle/base/io.py | 1 - 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index 4cc5603ab24b0d..d1bacd0f15f4db 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -34,14 +34,27 @@ # import all class inside framework into base module from . import framework -from .framework import * # noqa: F403 +from .framework import ( + Program, + Variable, + default_startup_program, + default_main_program, + program_guard, + cuda_places, + cpu_places, + cuda_pinned_places, + in_dygraph_mode, +) # import all class inside executor into base module from . import executor -from .executor import * # noqa: F403 +from .executor import ( + Executor, + global_scope, +) from . import data_feed_desc -from .data_feed_desc import * # noqa: F403 +from .data_feed_desc import DataFeedDesc from . import dataset @@ -71,7 +84,7 @@ from . import unique_name from . import compiler -from .compiler import * # noqa: F403 +from .compiler import CompiledProgram 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/dygraph/__init__.py b/python/paddle/base/dygraph/__init__.py index 6355ca337b9f84..b7d2dc84998567 100644 --- a/python/paddle/base/dygraph/__init__.py +++ b/python/paddle/base/dygraph/__init__.py @@ -13,10 +13,15 @@ # limitations under the License. from . import base -from .base import * # noqa: F403 +from .base import ( + no_grad, + no_grad_, + guard, + to_variable, +) from . import tracer -from .tracer import * # noqa: F403 +from .tracer import Tracer __all__ = [] diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index ee723474da9516..285474c723962c 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -16,7 +16,6 @@ from paddle.base.log_helper import get_logger from . import reader -from .reader import * # noqa: F403 __all__ = reader.__all__ From b26b047730f28e739516dec62f3931641fe4d72e Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Wed, 20 Sep 2023 16:13:04 +0800 Subject: [PATCH 08/10] update --- python/paddle/base/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index d1bacd0f15f4db..bb6ac6e0d21a19 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -36,7 +36,6 @@ from . import framework from .framework import ( Program, - Variable, default_startup_program, default_main_program, program_guard, @@ -44,6 +43,14 @@ cpu_places, cuda_pinned_places, in_dygraph_mode, + is_compiled_with_cinn, + is_compiled_with_cuda, + is_compiled_with_rocm, + Variable, + require_version, + device_guard, + set_flags, + get_flags, ) # import all class inside executor into base module From f2009108e985b37f28db89200708fa250ac9ee3e Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Wed, 20 Sep 2023 16:57:02 +0800 Subject: [PATCH 09/10] may be success --- python/paddle/base/__init__.py | 16 +++++++++++++++- python/paddle/base/dygraph/__init__.py | 4 ++++ python/paddle/base/io.py | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index bb6ac6e0d21a19..1c5961e9ba3d2a 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -39,13 +39,20 @@ default_startup_program, default_main_program, program_guard, + name_scope, + ipu_shard_guard, + set_ipu_shard, cuda_places, cpu_places, + xpu_places, cuda_pinned_places, in_dygraph_mode, + in_pir_mode, + in_dynamic_or_pir_mode, is_compiled_with_cinn, is_compiled_with_cuda, is_compiled_with_rocm, + is_compiled_with_xpu, Variable, require_version, device_guard, @@ -58,6 +65,7 @@ from .executor import ( Executor, global_scope, + scope_guard, ) from . import data_feed_desc @@ -91,7 +99,13 @@ from . import unique_name from . import compiler -from .compiler import CompiledProgram +from .compiler import ( + CompiledProgram, + ExecutionStrategy, + BuildStrategy, + IpuCompiledProgram, + IpuStrategy, +) 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/dygraph/__init__.py b/python/paddle/base/dygraph/__init__.py index b7d2dc84998567..2ac4df711681cd 100644 --- a/python/paddle/base/dygraph/__init__.py +++ b/python/paddle/base/dygraph/__init__.py @@ -16,7 +16,11 @@ from .base import ( no_grad, no_grad_, + grad, guard, + enable_dygraph, + disable_dygraph, + enabled, to_variable, ) diff --git a/python/paddle/base/io.py b/python/paddle/base/io.py index 285474c723962c..2ef88fd3189bf2 100644 --- a/python/paddle/base/io.py +++ b/python/paddle/base/io.py @@ -16,6 +16,10 @@ from paddle.base.log_helper import get_logger from . import reader +from .reader import ( # noqa: F401 + PyReader, + DataLoader, +) __all__ = reader.__all__ From e62ea7aa1cc9e4e15adcd516d44c75c56d11e22d Mon Sep 17 00:00:00 2001 From: ooooo <3164076421@qq.com> Date: Wed, 20 Sep 2023 18:08:29 +0800 Subject: [PATCH 10/10] may may be success! --- python/paddle/base/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/paddle/base/__init__.py b/python/paddle/base/__init__.py index 1c5961e9ba3d2a..acc6f9f51ae2ff 100644 --- a/python/paddle/base/__init__.py +++ b/python/paddle/base/__init__.py @@ -72,6 +72,10 @@ from .data_feed_desc import DataFeedDesc from . import dataset +from .dataset import ( + DatasetFactory, + InMemoryDataset, +) from . import trainer_desc