[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in `python/paddle/{tensor,utils,vision}` #67222

Whsjrczr · 2024-08-08T09:07:24Z

PR Category

User Experience

PR Types

Others

Description

修改了九个文件:
modified: python/paddle/tensor/math.py
modified: python/paddle/tensor/stat.py
modified: python/paddle/utils/cpp_extension/cpp_extension.py
modified: python/paddle/vision/datasets/cifar.py
modified: python/paddle/vision/datasets/flowers.py
modified: python/paddle/vision/datasets/folder.py
modified: python/paddle/vision/datasets/mnist.py
modified: python/paddle/vision/datasets/voc2012.py
modified: python/paddle/vision/models/_utils.py

… typing3

paddle-bot · 2024-08-08T09:07:28Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

…r | Image | npt.NDArray[Any]'.

SigureMo

不少是不需要修改的，恢复就好，但并不是说这个任务不算完成，确认是否是类型注解语义下也是这个任务的一部分，或者说最主要的一部分

SigureMo · 2024-08-09T06:56:57Z

python/paddle/tensor/math.py

+from typing import TYPE_CHECKING, Literal
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence


TYPE_CHECKING 移到下面，其他的也一样

SigureMo · 2024-08-09T06:57:25Z

python/paddle/vision/datasets/cifar.py

@@ -52,7 +51,7 @@
 }


-class Cifar10(Dataset[Tuple["_ImageDataType", "npt.NDArray[Any]"]]):
+class Cifar10(Dataset[tuple["_ImageDataType", "npt.NDArray[Any]"]]):


运行时会跑，这里不要改

SigureMo · 2024-08-09T06:59:10Z

python/paddle/vision/datasets/cifar.py

 from PIL import Image

 import paddle
+from paddle import Tensor


这几个为啥要挪出来？

SigureMo · 2024-08-09T06:59:19Z

python/paddle/vision/datasets/cifar.py

-    def __getitem__(self, idx: int) -> tuple[_ImageDataType, npt.NDArray[Any]]:
+    def __getitem__(
+        self, idx: int
+    ) -> tuple[Tensor | Image | npt.NDArray[Any], npt.NDArray[Any]]:


不要修改这些

SigureMo · 2024-08-09T06:59:44Z

python/paddle/vision/datasets/folder.py

@@ -87,7 +89,7 @@ def is_valid_file(x):
    return images


-class DatasetFolder(Dataset[Tuple["_ImageDataType", int]]):
+class DatasetFolder(Dataset[tuple["_ImageDataType", int]]):


同上，非类型注解上下文，不可以修改

SigureMo · 2024-08-09T06:59:50Z

python/paddle/vision/datasets/folder.py

@@ -339,7 +341,7 @@ def default_loader(path):
        return pil_loader(path)


-class ImageFolder(Dataset[List["_ImageDataType"]]):
+class ImageFolder(Dataset[list["_ImageDataType"]]):


SigureMo · 2024-08-09T06:59:56Z

python/paddle/vision/datasets/mnist.py

@@ -38,7 +38,7 @@
 __all__ = []


-class MNIST(Dataset[Tuple["_ImageDataType", "npt.NDArray[np.int64]"]]):
+class MNIST(Dataset[tuple["_ImageDataType", "npt.NDArray[np.int64]"]]):


SigureMo · 2024-08-09T07:00:03Z

python/paddle/vision/datasets/voc2012.py

@@ -51,7 +51,7 @@
 MODE_FLAG_MAP = {'train': 'trainval', 'test': 'train', 'valid': "val"}


-class VOC2012(Dataset[Tuple["_ImageDataType", "npt.NDArray[Any]"]]):
+class VOC2012(Dataset[tuple["_ImageDataType", "npt.NDArray[Any]"]]):


SigureMo · 2024-08-09T07:00:23Z

python/paddle/vision/models/_utils.py

@@ -72,10 +71,10 @@ class IntermediateLayerGetter(nn.LayerDict):
    """

    __annotations__ = {
-        "return_layers": Dict[str, str],
+        "return_layers": dict[str, str],


这里也会对运行时有影响，不需要修改

SigureMo · 2024-08-10T14:43:30Z

python/paddle/vision/models/_utils.py

    __annotations__ = {
-        "return_layers": Dict[str, str],
+        "return_layers": dict[str, str],
    }


这里直接改成这样

- __annotations__ = { - "return_layers": Dict[str, str], - } + return_layers: dict[str, str]

这样就是合法的了

啊，你这个文件都没用 PEP 563……你这会挂……

要用 PEP 563

… typing3

SigureMo · 2024-08-12T02:45:42Z

上面那么多 comment 呢，都要改啊

Whsjrczr · 2024-08-12T06:24:54Z

2024-08-12 13:50:21 from .flowers import Flowers
2024-08-12 13:50:21 File "/workspace/Paddle/build/python/paddle/vision/datasets/flowers.py", line 54, in
2024-08-12 13:50:21 class Flowers(Dataset[tuple["_ImageDataType", "npt.NDArray[np.int64]"]]):
2024-08-12 13:50:21 TypeError: 'type' object is not subscriptable

您好，SOT会发生这样的报错

SigureMo · 2024-08-12T06:28:08Z

再看看我上面的 comment，明显是漏恢复了

SigureMo · 2024-08-12T17:12:44Z

python/paddle/tensor/stat.py

+if TYPE_CHECKING:
+    from collections.abc import Sequence


if TYPE_CHECKING: 移到下面

SigureMo · 2024-08-12T17:12:50Z

python/paddle/utils/cpp_extension/cpp_extension.py

-from typing import TYPE_CHECKING, Any, Sequence
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:


… typing3

…ing3

SigureMo

LGTMeow

…type hints for 9 files in `python/paddle/{tensor,utils,vision}` (PaddlePaddle#67222)

Whsjrczr added 3 commits August 8, 2024 17:01

update 9 files

9f0c63d

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

03def21

… typing3

update 1 file

8dea717

Whsjrczr changed the title ~~Typing3~~ [Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in python/paddle/{tensor/utils/vision} Aug 8, 2024

gouzil mentioned this pull request Aug 8, 2024

[Typing][PEP585 Upgrade] PEP 585 标准集合泛型支持升级——Python 3.8 退场前瞻特别任务 #66936

Closed

paddle-bot bot added the contributor External developers label Aug 8, 2024

luotao1 added the HappyOpenSource Pro 进阶版快乐开源活动，更具挑战性的任务 label Aug 9, 2024

luotao1 assigned luotao1, SigureMo and gouzil Aug 9, 2024

update 1 file

349a246

This was referenced Aug 9, 2024

[WeeklyReport] Whsjrczr 2024.07.27~2024.08.09.md PFCCLab/Starter#310

Merged

[WeeklyReports] 2024.07.27~2024.08.09 周报收集 PFCCLab/Starter#300

Open

Whsjrczr added 2 commits August 9, 2024 13:29

update cifar.py. Union is abort. Replace '_ImageDataType' with 'Tenso…

1ef5b26

…r | Image | npt.NDArray[Any]'.

undo change in cifar.py

4f2732a

SigureMo reviewed Aug 9, 2024

View reviewed changes

SigureMo reviewed Aug 10, 2024

View reviewed changes

Whsjrczr added 2 commits August 12, 2024 10:01

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

ba1f52a

… typing3

update _utils.py

7786ad1

update 4 files

8daf220

update 2 files

d5143c1

SigureMo reviewed Aug 12, 2024

View reviewed changes

Whsjrczr added 2 commits August 13, 2024 10:03

changed 2 files

8ab415e

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

0a8e5d2

… typing3

Merge branch 'typing3' of https://github.com/Whsjrczr/Paddle into typ…

6aa07db

…ing3

SigureMo approved these changes Aug 13, 2024

View reviewed changes

SigureMo merged commit 171efa1 into PaddlePaddle:develop Aug 13, 2024
29 of 30 checks passed

Jeff114514 pushed a commit to Jeff114514/Paddle that referenced this pull request Aug 14, 2024

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for …

b044742

…type hints for 9 files in `python/paddle/{tensor,utils,vision}` (PaddlePaddle#67222)

This was referenced Aug 23, 2024

[WeeklyReport]Whsjrczr 2024.08.10 ~ 2024.08.23 PFCCLab/Starter#357

Merged

[WeeklyReports] 2024.08.10~2024.08.23 周报收集 PFCCLab/Starter#340

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in `python/paddle/{tensor,utils,vision}` #67222

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in `python/paddle/{tensor,utils,vision}` #67222

Whsjrczr commented Aug 8, 2024 •

edited

Loading

paddle-bot bot commented Aug 8, 2024

SigureMo left a comment

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

SigureMo Aug 9, 2024

Whsjrczr Aug 9, 2024

SigureMo Aug 10, 2024

SigureMo Aug 10, 2024

SigureMo commented Aug 12, 2024

Whsjrczr commented Aug 12, 2024

SigureMo commented Aug 12, 2024

SigureMo Aug 12, 2024

SigureMo Aug 12, 2024

Whsjrczr Aug 13, 2024

SigureMo left a comment

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in python/paddle/{tensor,utils,vision} #67222

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in python/paddle/{tensor,utils,vision} #67222

Conversation

Whsjrczr commented Aug 8, 2024 • edited Loading

PR Category

PR Types

Description

paddle-bot bot commented Aug 8, 2024

SigureMo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SigureMo commented Aug 12, 2024

Whsjrczr commented Aug 12, 2024

SigureMo commented Aug 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SigureMo left a comment

Choose a reason for hiding this comment

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in `python/paddle/{tensor,utils,vision}` #67222

[Typing][PEP585 Upgrade][BUAA][121-129] Use standard collections for type hints for 9 files in `python/paddle/{tensor,utils,vision}` #67222

Whsjrczr commented Aug 8, 2024 •

edited

Loading