fix bug for pool2d and pool2d_grad when kernel_size > in_h/in_w in xpu (

#53043)
PaddlePaddle · Apr 19, 2023 · b1d3ec1 · b1d3ec1
1 parent 28492bf
commit b1d3ec1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/paddle/phi/kernels/xpu/pool_grad_kernel.cc b/paddle/phi/kernels/xpu/pool_grad_kernel.cc
@@ -154,11 +154,11 @@ void Pool2dGradKernel(const Context& ctx,
 
     PADDLE_ENFORCE_XDNN_SUCCESS(r, "adaptive_pool2d_grad");
   } else {
-    if (kernel_size[0] > in_h) {
-      kernel_size[0] = in_h;
+    if (kernel_size[0] > (in_h + paddings[0] + paddings[1])) {
+      kernel_size[0] = in_h + paddings[0] + paddings[1];
     }
-    if (kernel_size[1] > in_w) {
-      kernel_size[1] = in_w;
+    if (kernel_size[1] > (in_w + paddings[2] + paddings[3])) {
+      kernel_size[1] = in_w + paddings[2] + paddings[3];
     }
     if (pooling_type == "max") {
       // TODO(zhanghuan05) to bind max_pool2d_grad_indices xpu api

diff --git a/paddle/phi/kernels/xpu/pool_kernel.cc b/paddle/phi/kernels/xpu/pool_kernel.cc
@@ -90,11 +90,11 @@ void Pool2dKernel(const Context& ctx,
   int* index_data = nullptr;
   int r = xpu::Error_t::SUCCESS;
   if (!adaptive) {
-    if (kernel_size[0] > in_h) {
-      kernel_size[0] = in_h;
+    if (kernel_size[0] > (in_h + paddings[0] + paddings[1])) {
+      kernel_size[0] = in_h + paddings[0] + paddings[1];
     }
-    if (kernel_size[1] > in_w) {
-      kernel_size[1] = in_w;
+    if (kernel_size[1] > (in_w + paddings[2] + paddings[3])) {
+      kernel_size[1] = in_w + paddings[2] + paddings[3];
     }
     if (pooling_type == "max") {
       r = xpu::max_pool2d<XPUType>(