[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/functional/{activation.py, common.py, conv.py}` #65191

gsq7474741 · 2024-06-14T19:38:48Z

PR Category

User Experience

PR Types

Improvements

Description

类型标注：

paddle/nn/functional/activation.py
paddle/nn/functional/common.py
paddle/nn/functional/conv.py

Related links

[Type Hints] 为公开 API 标注类型提示信息 #65008

@SigureMo @megemini

paddle-bot · 2024-06-14T19:38:52Z

你的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.

SigureMo · 2024-06-15T03:16:46Z

python/paddle/nn/functional/activation.py

+def softmax(
+    x: Tensor,
+    axis: int = -1,
+    dtype: Literal['bfloat16', 'float16', 'float32', 'float64'] | None = None,


不支持 paddle.dtype 形式么？支持的话统一使用 DTypeLike

这里没说支持int和complex和bool

这个是没关系的，我们不可能每次将所有支持的数据类型都枚举出来，这部分工作只能由运行时来做，至少我们需要保证该支持的传进来类型检查不会报错，目前这类 API 应该统一使用 DTypeLike

修改下这里就没其它的问题了，这里明显是支持 paddle.dtype / np.dtype 的

Paddle/python/paddle/nn/functional/activation.py

Lines 1198 to 1203 in 8f8bd44

if (

(dtype is not None)

and (not isinstance(dtype, core.VarDesc.VarType))

and (not isinstance(dtype, core.DataType))

):

dtype = convert_np_dtype_to_dtype_(dtype)

SigureMo · 2024-06-15T03:16:59Z

python/paddle/nn/functional/activation.py

+def softmax_(
+    x: Tensor,
+    axis: int = -1,
+    dtype: Literal['bfloat16', 'float16', 'float32', 'float64'] | None = None,


这里没说支持int和complex和bool

SigureMo · 2024-06-15T03:17:41Z

python/paddle/nn/functional/activation.py

+def log_softmax(
+    x: Tensor,
+    axis: int = -1,
+    dtype: Literal['float32', 'float64'] | None = None,


python/paddle/nn/functional/common.py

python/paddle/nn/functional/conv.py

SigureMo

#65197 发现了 DataLayout2D 里的一个 typo，可以麻烦先改一下么？

-DataLayout2D: TypeAlias = Literal["NCHW", "NHCW"]
+DataLayout2D: TypeAlias = Literal["NCHW", "NHWC"]

gsq7474741 · 2024-06-16T17:41:25Z

DataLayout2D: TypeAlias = Literal["NCHW", "NHWC"]

夜猫子好评 >_<

megemini · 2024-06-17T10:24:59Z

@gsq7474741 CI 里面 fail 的，看看是不是 numpy 版本与 opencv 兼容问题～可以重新构建一下～

python/paddle/nn/functional/activation.py

python/paddle/nn/functional/common.py

megemini · 2024-06-17T10:42:21Z

python/paddle/nn/functional/common.py

+    x: Tensor,
+    size: ShapeLike | None = None,
+    scale_factor: ShapeLike | None = None,
+    mode: Literal[


放到 _typing 里面吧，加个类似 PaddingMode 的类型，叫做 InterpolateMode 吧～其他地方也会用到～

另外，Literal["NCW", "NWC", "NCHW", "NHWC", "NCDHW", "NDHWC"] 这个也改成 DataLayoutNDVariant 吧，类似 DataLayout1DVariant ～在 _typing.layout.py 下面～

@SigureMo 后面是不是可以反馈一下，把这个统一一下～

确认下其他地方有没有用，没有用的话不建议一股脑丢到 _typing，部分类型可以按照模块本来的 import 关系管理，比如 functional 里定义一个 TypeAlias，layer 里引用，那就完全没必要塞到 _typing

不多，就这几个

megemini · 2024-06-17T10:42:56Z

python/paddle/nn/functional/common.py

+    ] = 'nearest',
+    align_corners: bool = False,
+    align_mode: int = 0,
+    data_format: Literal["NCW", "NWC", "NCHW", "NHWC", "NCDHW", "NDHWC"] = None,


megemini · 2024-06-17T10:53:01Z

python/paddle/nn/functional/common.py

+def pad(
+    x: Tensor,
+    pad: ShapeLike,
+    mode: Literal["constant", "reflect", "replicate", "circular"] = 'constant',


刚翻了一下 numpy 的处理方式，numpy 是把这类东西叫做 _ModeKind ，私有的，所以放到各个模块中～

由此，后面类似的处理方式可以有两种：

numpy 的方式

统一放到 _typing 中，但是名称有区分

如果采用后者，这个也放到 _typing 里面，感觉这个叫 PaddingMode， conv 里面的那个叫 ConvPaddingMode ～如何？

@SigureMo 帮忙看看

python/paddle/nn/functional/common.py

…int_545556

gsq7474741 · 2024-06-17T16:15:14Z

@SigureMo 这个不算PaddlePaddle Hackathon吗

SigureMo · 2024-06-17T16:48:25Z

@SigureMo 这个不算PaddlePaddle Hackathon吗

我不确定，我看之前的子任务都是用的 HappyOpenSource 快乐开源活动issue与PR

@luotao1 确认下？

@gsq7474741 不过这个会有什么影响吗？

SigureMo

LGTMeow

…al/{activation.py, common.py, conv.py}` (PaddlePaddle#65191) --------- Co-authored-by: SigureMo <sigure.qaq@gmail.com>

init

1e77236

paddle-bot bot added the contributor External developers label Jun 14, 2024

fix some pre-commit:ruff errors

ba76c75

SigureMo reviewed Jun 15, 2024

View reviewed changes

SigureMo mentioned this pull request Jun 15, 2024

[Typing][A-15] Add type annotations for paddle/nn/layer/common.py #65197

Merged

megemini mentioned this pull request Jun 15, 2024

[Type Hints] 为公开 API 标注类型提示信息 #65008

Closed

fix some bugs

9f8c994

SigureMo reviewed Jun 16, 2024

View reviewed changes

gsq7474741 requested review from zrr1999 and gouzil as code owners June 16, 2024 17:39

fix some typo

b4c6011

fix conflict

f216444

SigureMo added the HappyOpenSource 快乐开源活动issue与PR label Jun 17, 2024

megemini reviewed Jun 17, 2024

View reviewed changes

Merge remote-tracking branch 'refs/remotes/origin/develop' into typeh…

cb942ff

…int_545556

fix some bugs

373c821

fix mypy test errors

3ea404a

SigureMo approved these changes Jun 18, 2024

View reviewed changes

SigureMo merged commit 5b69171 into PaddlePaddle:develop Jun 19, 2024
32 of 33 checks passed

co63oc pushed a commit to co63oc/Paddle that referenced this pull request Jun 25, 2024

[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/function…

987e933

…al/{activation.py, common.py, conv.py}` (PaddlePaddle#65191) --------- Co-authored-by: SigureMo <sigure.qaq@gmail.com>

megemini mentioned this pull request Jun 26, 2024

[Typing][A-17] Add type annotations for conv layers #65183

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/functional/{activation.py, common.py, conv.py}` #65191

[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/functional/{activation.py, common.py, conv.py}` #65191

gsq7474741 commented Jun 14, 2024 •

edited

Loading

paddle-bot bot commented Jun 14, 2024

SigureMo Jun 15, 2024

gsq7474741 Jun 16, 2024 •

edited

Loading

SigureMo Jun 16, 2024

SigureMo Jun 17, 2024

SigureMo Jun 15, 2024

gsq7474741 Jun 16, 2024

SigureMo Jun 15, 2024

gsq7474741 Jun 16, 2024

SigureMo left a comment

gsq7474741 commented Jun 16, 2024

megemini commented Jun 17, 2024

megemini Jun 17, 2024

SigureMo Jun 17, 2024

gsq7474741 Jun 17, 2024

megemini Jun 17, 2024

megemini Jun 17, 2024

gsq7474741 commented Jun 17, 2024

SigureMo commented Jun 17, 2024

SigureMo left a comment

	if (
	(dtype is not None)
	and (not isinstance(dtype, core.VarDesc.VarType))
	and (not isinstance(dtype, core.DataType))
	):
	dtype = convert_np_dtype_to_dtype_(dtype)

[Typing][A-54,A-55,A-56] Add type annotations for paddle/nn/functional/{activation.py, common.py, conv.py} #65191

[Typing][A-54,A-55,A-56] Add type annotations for paddle/nn/functional/{activation.py, common.py, conv.py} #65191

Conversation

gsq7474741 commented Jun 14, 2024 • edited Loading

PR Category

PR Types

Description

Related links

paddle-bot bot commented Jun 14, 2024

Choose a reason for hiding this comment

gsq7474741 Jun 16, 2024 • edited Loading

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 left a comment

Choose a reason for hiding this comment

gsq7474741 commented Jun 16, 2024

megemini commented Jun 17, 2024

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

gsq7474741 commented Jun 17, 2024

SigureMo commented Jun 17, 2024

SigureMo left a comment

Choose a reason for hiding this comment

[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/functional/{activation.py, common.py, conv.py}` #65191

[Typing][A-54,A-55,A-56] Add type annotations for `paddle/nn/functional/{activation.py, common.py, conv.py}` #65191

gsq7474741 commented Jun 14, 2024 •

edited

Loading

gsq7474741 Jun 16, 2024 •

edited

Loading