Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3a8c699
naive implement
WintersMontagne10335 Dec 1, 2025
bcbeb54
update
WintersMontagne10335 Dec 1, 2025
1f92a46
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 1, 2025
cb487f9
update
WintersMontagne10335 Dec 1, 2025
f582b9f
update
WintersMontagne10335 Dec 2, 2025
b63d45d
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 2, 2025
d2cf355
update
WintersMontagne10335 Dec 2, 2025
5f77217
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 2, 2025
5096c40
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 5, 2025
ff24ce3
update
WintersMontagne10335 Dec 5, 2025
e15c147
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 5, 2025
32c16f6
update
WintersMontagne10335 Dec 6, 2025
4fbc263
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 6, 2025
1953589
update
WintersMontagne10335 Dec 6, 2025
9a2de36
update
WintersMontagne10335 Dec 6, 2025
f8e0db9
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 8, 2025
1a41726
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 9, 2025
4fe497c
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 9, 2025
98e5b17
update
WintersMontagne10335 Dec 9, 2025
967b3bc
update
WintersMontagne10335 Dec 9, 2025
d54b205
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 9, 2025
2133a77
update
WintersMontagne10335 Dec 9, 2025
37ea197
update
WintersMontagne10335 Dec 9, 2025
d694f46
update
WintersMontagne10335 Dec 10, 2025
8970a99
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 10, 2025
351773b
update
WintersMontagne10335 Dec 10, 2025
5a6f478
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 11, 2025
187670b
update
WintersMontagne10335 Dec 11, 2025
4dd58d8
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 11, 2025
502d99f
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 12, 2025
4ae3219
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 12, 2025
b5e0d06
update for ci dcu
WintersMontagne10335 Dec 13, 2025
a2ad576
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 13, 2025
1d818f5
update cmakelists
WintersMontagne10335 Dec 14, 2025
254ee30
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 14, 2025
715e508
update
WintersMontagne10335 Dec 14, 2025
48601cd
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 15, 2025
b2bd396
Sink the judgment logic down to the C++ layer
WintersMontagne10335 Dec 15, 2025
22a69c6
update
WintersMontagne10335 Dec 15, 2025
719e8a9
update
WintersMontagne10335 Dec 15, 2025
0898713
update op_build_gen
WintersMontagne10335 Dec 18, 2025
b51d436
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 18, 2025
53590b5
Merge remote-tracking branch 'upstream/develop' into hackathon9th06planb
WintersMontagne10335 Dec 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update
  • Loading branch information
WintersMontagne10335 committed Dec 9, 2025
commit 967b3bcfcb9e9181cbb5bfaf5a6f6910f437380a
80 changes: 38 additions & 42 deletions python/paddle/nn/functional/pooling.py
Original file line number Diff line number Diff line change
Expand Up @@ -1238,56 +1238,52 @@ def max_pool2d(

if in_dynamic_or_pir_mode():
if return_mask:
if dilation_greater_than_one:
output = _C_ops.max_pool2d_with_dilations_and_index(
x, kernel_size, stride, padding, dilation, False, ceil_mode
)
else:
output = _C_ops.max_pool2d_with_index(
x, kernel_size, stride, padding, False, False, ceil_mode
)
return output if return_mask else output[0]
else:
return _C_ops.pool2d(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是说直接修改pool2d会引起很多兼容性问题对吧,所以改名为一个新op:max_pool2d_with_dilations

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

avg 等等其他算子也依赖 pool2d,对于它们来说,dilation是冗余的

# if dilation_greater_than_one:
# output = _C_ops.max_pool2d_with_dilations_and_index(
# x, kernel_size, stride, padding, dilation, False, ceil_mode
# )
# else:
# output = _C_ops.max_pool2d_with_index(
# x, kernel_size, stride, padding, False, False, ceil_mode
# )
output = _C_ops.max_pool2d_with_index(
x,
kernel_size,
stride,
padding,
dilation,
ceil_mode,
True,
data_format,
'max',
False,
False,
padding_algorithm,
ceil_mode,
)
# if dilation_greater_than_one:
# return _C_ops.max_pool2d_with_dilations(
# x,
# kernel_size,
# stride,
# padding,
# dilation,
# ceil_mode,
# data_format,
# False,
# padding_algorithm,
# )
# else:
# return _C_ops.pool2d(
# x,
# kernel_size,
# stride,
# padding,
# ceil_mode,
# True,
# data_format,
# 'max',
# False,
# False,
# padding_algorithm,
# )
return output if return_mask else output[0]
else:
if dilation_greater_than_one:
Copy link
Contributor

@zhwesky2010 zhwesky2010 Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果help这个分支有问题,可以不修改。这个功能加到dynamic_or_pir下。

Copy link
Contributor

@zhwesky2010 zhwesky2010 Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python尽量不要去加太多分支和逻辑。pool_2d的兼容性问题是什么?是在老IR分支吗,老IR可以不维护

Copy link
Contributor Author

@WintersMontagne10335 WintersMontagne10335 Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dilation_greater_than_one 不需要了,最新 commit 将相关分支下沉到 cpp 了

return _C_ops.max_pool2d_with_dilations(
x,
kernel_size,
stride,
padding,
dilation,
ceil_mode,
data_format,
False,
padding_algorithm,
)
else:
return _C_ops.pool2d(
x,
kernel_size,
stride,
padding,
ceil_mode,
True,
data_format,
'max',
False,
False,
padding_algorithm,
)

else:
if return_mask:
Expand Down