From a4b30a1237fd3ed5c32be1a32f6cb880bc3aac1b Mon Sep 17 00:00:00 2001
From: Qi Li <qili93@qq.com>
Date: Thu, 1 Apr 2021 18:53:38 +0800
Subject: [PATCH] [ROCM] fix depthwise conv failure on ROCM, test=develop
 (#31998)

---
 paddle/fluid/operators/math/depthwise_conv.cu | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/paddle/fluid/operators/math/depthwise_conv.cu b/paddle/fluid/operators/math/depthwise_conv.cu
index 7439a959d3..d116b620dc 100644
--- a/paddle/fluid/operators/math/depthwise_conv.cu
+++ b/paddle/fluid/operators/math/depthwise_conv.cu
@@ -613,6 +613,9 @@ class DepthwiseConvFunctor<platform::CUDADeviceContext, T,
       thread = (output_width - 1) / 2 + 1;
     else if (output_width > 512 && output_width <= 1024)
       thread = output_width;
+#ifdef __HIPCC__
+    thread = std::min(thread, 256);
+#endif
     int blocks = std::min(std::max(thread / output_width, 1), output_height);
     dim3 threads(std::min(output_width, thread), blocks, 1);
     dim3 grid(output_channels, batch_size, 1);
@@ -620,7 +623,13 @@ class DepthwiseConvFunctor<platform::CUDADeviceContext, T,
 
     int nums_output =
         batch_size * output_channels * output_height * output_width;
+#ifdef __HIPCC__
+    int block_size = 256;
+    int grid_size = std::min((nums_output + block_size - 1) / block_size, 256);
+#else
     int block_size = 512;
+    int grid_size = (nums_output + block_size - 1) / block_size;
+#endif
 
 #define check_case(c_filter_multiplier, c_stride, c_filter)                  \
   if (c_filter_multiplier == 0 ||                                            \
@@ -630,7 +639,7 @@ class DepthwiseConvFunctor<platform::CUDADeviceContext, T,
            c_filter == -1)) {                                                \
     if (c_filter == -1) {                                                    \
       threads.x = block_size;                                                \
-      grid.x = (nums_output + block_size - 1) / block_size;                  \
+      grid.x = grid_size;                                                    \
       threads.y = threads.z = grid.y = grid.z = 1;                           \
     }                                                                        \
     KernelDepthwiseConvSp<                                                   \
-- 
GitLab