From fa5fce88eacbffa52489d3ef992e746939b32964 Mon Sep 17 00:00:00 2001
From: Whsjrczr <guocindy@live.com>
Date: Wed, 7 Aug 2024 18:07:09 +0800
Subject: [PATCH 1/5] typing update in 10 files

---
 python/paddle/quantization/config.py       | 4 ++--
 python/paddle/reader/decorator.py          | 7 ++++---
 python/paddle/sparse/nn/functional/conv.py | 5 ++++-
 python/paddle/sparse/nn/layer/conv.py      | 5 ++++-
 python/paddle/sparse/unary.py              | 5 ++++-
 python/paddle/tensor/array.py              | 5 ++++-
 python/paddle/tensor/creation.py           | 5 ++++-
 python/paddle/tensor/einsum.py             | 5 ++++-
 python/paddle/tensor/linalg.py             | 5 ++++-
 python/paddle/tensor/manipulation.py       | 5 ++++-
 10 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/python/paddle/quantization/config.py b/python/paddle/quantization/config.py
index 9146ef159250fa..da91e74e3cbefe 100644
--- a/python/paddle/quantization/config.py
+++ b/python/paddle/quantization/config.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import copy
-from typing import Dict, Union
+from typing import Union
 
 import paddle
 from paddle import nn
@@ -23,7 +23,7 @@
 from .wrapper import ObserveWrapper
 
 # TODO: Implement quanted layer and fill the mapping dict
-DEFAULT_QAT_LAYER_MAPPINGS: Dict[Layer, Layer] = {
+DEFAULT_QAT_LAYER_MAPPINGS: dict[Layer, Layer] = {
     nn.quant.Stub: nn.quant.stub.QuanterStub,
     nn.Linear: nn.quant.qat.QuantedLinear,
     nn.Conv2D: nn.quant.qat.QuantedConv2D,
diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py
index cbda11e0375ba7..e3058b4226e19e 100644
--- a/python/paddle/reader/decorator.py
+++ b/python/paddle/reader/decorator.py
@@ -20,20 +20,21 @@
 import random
 import sys
 import warnings
+from collections.abc import Callable, Generator
 from itertools import zip_longest
 from queue import Queue
 from threading import Thread
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Generator,
-    Sequence,
     TypedDict,
     TypeVar,
     overload,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
 from typing_extensions import NotRequired, TypeAlias, Unpack
 
 from paddle.base.reader import QUEUE_GET_TIMEOUT
diff --git a/python/paddle/sparse/nn/functional/conv.py b/python/paddle/sparse/nn/functional/conv.py
index a00385313f5214..135a2675cd2082 100644
--- a/python/paddle/sparse/nn/functional/conv.py
+++ b/python/paddle/sparse/nn/functional/conv.py
@@ -14,7 +14,10 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Sequence
+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 __all__ = []
 
diff --git a/python/paddle/sparse/nn/layer/conv.py b/python/paddle/sparse/nn/layer/conv.py
index e103b1db7021b1..3d26a8575da579 100644
--- a/python/paddle/sparse/nn/layer/conv.py
+++ b/python/paddle/sparse/nn/layer/conv.py
@@ -14,7 +14,10 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Sequence
+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import numpy as np
 
diff --git a/python/paddle/sparse/unary.py b/python/paddle/sparse/unary.py
index 88fffae0357edf..d23f23b32ae1cb 100644
--- a/python/paddle/sparse/unary.py
+++ b/python/paddle/sparse/unary.py
@@ -14,7 +14,10 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Sequence
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import numpy as np
 
diff --git a/python/paddle/tensor/array.py b/python/paddle/tensor/array.py
index 6b0733e0bd71bc..7dcb56cff139c4 100644
--- a/python/paddle/tensor/array.py
+++ b/python/paddle/tensor/array.py
@@ -15,7 +15,10 @@
 # Define functions about array.
 from __future__ import annotations
 
-from typing import Any, Sequence, TypeVar, overload
+from typing import TYPE_CHECKING, Any, TypeVar, overload
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import paddle
 from paddle import _typing
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
index 59bf9c99a3d40a..7dd0fc2c56e606 100644
--- a/python/paddle/tensor/creation.py
+++ b/python/paddle/tensor/creation.py
@@ -16,7 +16,10 @@
 
 import math
 import re
-from typing import TYPE_CHECKING, Any, Sequence, overload
+from typing import TYPE_CHECKING, Any, overload
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import numpy as np
 import numpy.typing as npt
diff --git a/python/paddle/tensor/einsum.py b/python/paddle/tensor/einsum.py
index 297d61fa1f9016..d38ca5a521fbea 100644
--- a/python/paddle/tensor/einsum.py
+++ b/python/paddle/tensor/einsum.py
@@ -17,7 +17,10 @@
 import itertools
 import re
 import string
-from typing import TYPE_CHECKING, NamedTuple, Sequence
+from typing import TYPE_CHECKING, NamedTuple
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import numpy as np
 import opt_einsum
diff --git a/python/paddle/tensor/linalg.py b/python/paddle/tensor/linalg.py
index e72587c8c6637f..a9b66ae0d464b8 100644
--- a/python/paddle/tensor/linalg.py
+++ b/python/paddle/tensor/linalg.py
@@ -13,7 +13,10 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Sequence, overload
+from typing import TYPE_CHECKING, Literal, overload
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 import numpy as np
 from typing_extensions import TypeAlias
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
index 1a56fec0662a57..e598fed348ecf5 100644
--- a/python/paddle/tensor/manipulation.py
+++ b/python/paddle/tensor/manipulation.py
@@ -15,7 +15,10 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING, Any, Callable, Literal, Sequence, overload
+from typing import TYPE_CHECKING, Any, Literal, overload
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
 
 import numpy as np
 

From be4f1fd15b96085192eb97e672a7e6bdceb47a73 Mon Sep 17 00:00:00 2001
From: Whsjrczr <guocindy@live.com>
Date: Thu, 8 Aug 2024 10:19:24 +0800
Subject: [PATCH 2/5] update a file

---
 python/paddle/reader/decorator.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py
index e3058b4226e19e..290a06108ab08d 100644
--- a/python/paddle/reader/decorator.py
+++ b/python/paddle/reader/decorator.py
@@ -20,13 +20,14 @@
 import random
 import sys
 import warnings
-from collections.abc import Callable, Generator
+from collections.abc import Generator
 from itertools import zip_longest
 from queue import Queue
 from threading import Thread
 from typing import (
     TYPE_CHECKING,
     Any,
+    Callable,
     TypedDict,
     TypeVar,
     overload,

From 6d26d41e0354ccd36dfcf9f92327cf2eca6ee7fc Mon Sep 17 00:00:00 2001
From: Whsjrczr <guocindy@live.com>
Date: Thu, 8 Aug 2024 10:52:10 +0800
Subject: [PATCH 3/5] Codestyle Check

---
 python/paddle/quantization/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/paddle/quantization/config.py b/python/paddle/quantization/config.py
index e8f13a910012db..84cf650613e392 100644
--- a/python/paddle/quantization/config.py
+++ b/python/paddle/quantization/config.py
@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 import copy
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 import paddle
 from paddle import nn

From 1fd49372312fcc7c5a8af084f1a3e27857d70edb Mon Sep 17 00:00:00 2001
From: Whsjrczr <guocindy@live.com>
Date: Fri, 9 Aug 2024 10:12:26 +0800
Subject: [PATCH 4/5] update the location of if.

---
 python/paddle/reader/decorator.py          | 4 +---
 python/paddle/sparse/nn/functional/conv.py | 5 ++---
 python/paddle/sparse/nn/layer/conv.py      | 5 ++---
 python/paddle/sparse/unary.py              | 5 ++---
 python/paddle/tensor/array.py              | 6 +++---
 python/paddle/tensor/creation.py           | 5 ++---
 python/paddle/tensor/einsum.py             | 5 ++---
 python/paddle/tensor/linalg.py             | 5 ++---
 python/paddle/tensor/manipulation.py       | 5 ++---
 9 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py
index 290a06108ab08d..abe05787b7179c 100644
--- a/python/paddle/reader/decorator.py
+++ b/python/paddle/reader/decorator.py
@@ -33,14 +33,12 @@
     overload,
 )
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 from typing_extensions import NotRequired, TypeAlias, Unpack
 
 from paddle.base.reader import QUEUE_GET_TIMEOUT
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
 
     class _ComposeOptions(TypedDict):
         check_alignment: NotRequired[bool]
diff --git a/python/paddle/sparse/nn/functional/conv.py b/python/paddle/sparse/nn/functional/conv.py
index 135a2675cd2082..aec6d953c4cf9a 100644
--- a/python/paddle/sparse/nn/functional/conv.py
+++ b/python/paddle/sparse/nn/functional/conv.py
@@ -16,9 +16,6 @@
 
 from typing import TYPE_CHECKING, Literal
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 __all__ = []
 
 from paddle import _C_ops, in_dynamic_mode
@@ -30,6 +27,8 @@
 from ...binary import add
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle import Tensor
     from paddle._typing import (
         DataLayout2D,
diff --git a/python/paddle/sparse/nn/layer/conv.py b/python/paddle/sparse/nn/layer/conv.py
index 3d26a8575da579..0f4126ae35a10f 100644
--- a/python/paddle/sparse/nn/layer/conv.py
+++ b/python/paddle/sparse/nn/layer/conv.py
@@ -16,9 +16,6 @@
 
 from typing import TYPE_CHECKING, Literal
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import numpy as np
 
 from paddle.nn import Layer
@@ -29,6 +26,8 @@
 from .. import functional as F
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle import Tensor
     from paddle._typing import (
         ParamAttrLike,
diff --git a/python/paddle/sparse/unary.py b/python/paddle/sparse/unary.py
index d23f23b32ae1cb..f18e50d56e8076 100644
--- a/python/paddle/sparse/unary.py
+++ b/python/paddle/sparse/unary.py
@@ -16,9 +16,6 @@
 
 from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import numpy as np
 
 import paddle
@@ -34,6 +31,8 @@
 from paddle.framework import LayerHelper
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle import Tensor
     from paddle._typing import DTypeLike, ShapeLike
 
diff --git a/python/paddle/tensor/array.py b/python/paddle/tensor/array.py
index 7dcb56cff139c4..f4cd3e174da624 100644
--- a/python/paddle/tensor/array.py
+++ b/python/paddle/tensor/array.py
@@ -17,9 +17,6 @@
 
 from typing import TYPE_CHECKING, Any, TypeVar, overload
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import paddle
 from paddle import _typing
 
@@ -28,6 +25,9 @@
 from ..common_ops_import import Variable
 from ..framework import LayerHelper, core, in_dynamic_mode
 
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
 __all__ = []
 T = TypeVar("T")
 
diff --git a/python/paddle/tensor/creation.py b/python/paddle/tensor/creation.py
index 7dd0fc2c56e606..983d055b87f68e 100644
--- a/python/paddle/tensor/creation.py
+++ b/python/paddle/tensor/creation.py
@@ -18,9 +18,6 @@
 import re
 from typing import TYPE_CHECKING, Any, overload
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import numpy as np
 import numpy.typing as npt
 
@@ -51,6 +48,8 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle._typing import (
         DTypeLike,
         NestedNumbericSequence,
diff --git a/python/paddle/tensor/einsum.py b/python/paddle/tensor/einsum.py
index d38ca5a521fbea..1bb7af045381dd 100644
--- a/python/paddle/tensor/einsum.py
+++ b/python/paddle/tensor/einsum.py
@@ -19,9 +19,6 @@
 import string
 from typing import TYPE_CHECKING, NamedTuple
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import numpy as np
 import opt_einsum
 
@@ -38,6 +35,8 @@
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle import Tensor
 
 __all__ = []
diff --git a/python/paddle/tensor/linalg.py b/python/paddle/tensor/linalg.py
index a9b66ae0d464b8..77f2eca520affe 100644
--- a/python/paddle/tensor/linalg.py
+++ b/python/paddle/tensor/linalg.py
@@ -15,9 +15,6 @@
 
 from typing import TYPE_CHECKING, Literal, overload
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 import numpy as np
 from typing_extensions import TypeAlias
 
@@ -45,6 +42,8 @@
 from .math import _get_reduce_axis
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from paddle import Tensor
 
     _POrder: TypeAlias = Literal['fro', 'nuc']
diff --git a/python/paddle/tensor/manipulation.py b/python/paddle/tensor/manipulation.py
index 48547a97e694ef..34ce5de967835a 100644
--- a/python/paddle/tensor/manipulation.py
+++ b/python/paddle/tensor/manipulation.py
@@ -17,9 +17,6 @@
 import math
 from typing import TYPE_CHECKING, Any, Literal, overload
 
-if TYPE_CHECKING:
-    from collections.abc import Callable, Sequence
-
 import numpy as np
 
 import paddle
@@ -46,6 +43,8 @@
 from .creation import _complex_to_real_dtype, _real_to_complex_dtype, zeros
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
+
     from paddle import Tensor
     from paddle._typing import (
         DTypeLike,

From ab1752a2dabe5f75ad4a5ddf664b76f1aafb9b19 Mon Sep 17 00:00:00 2001
From: gouzi <530971494@qq.com>
Date: Fri, 9 Aug 2024 13:38:54 +0800
Subject: [PATCH 5/5] fix `Generator`

---
 python/paddle/reader/decorator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/paddle/reader/decorator.py b/python/paddle/reader/decorator.py
index abe05787b7179c..370910cae8bfb4 100644
--- a/python/paddle/reader/decorator.py
+++ b/python/paddle/reader/decorator.py
@@ -20,7 +20,6 @@
 import random
 import sys
 import warnings
-from collections.abc import Generator
 from itertools import zip_longest
 from queue import Queue
 from threading import Thread
@@ -28,6 +27,7 @@
     TYPE_CHECKING,
     Any,
     Callable,
+    Generator,
     TypedDict,
     TypeVar,
     overload,