Merge branch 'develop' into 82

Author: Le-soleile

backends/iluvatar_gpu/kernels/cuda_kernels/ctc_align_kernel_register.cu

@@ -13,11 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/ctc_align_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/ctc_align_kernel.h"
 
-PD_CUSTOM_KERNEL_REGISTER(ctc_align,
-                          iluvatar_gpu,
-                          ALL_LAYOUT,
-                          phi::CTCAlignOpCUDAKernel,
-                          int,
-                          int64_t) {}
+PD_CUSTOM_KERNEL_REGISTER(
+    ctc_align, iluvatar_gpu, ALL_LAYOUT, phi::CTCAlignKernel, int, int64_t) {}

backends/metax_gpu/CMakeLists.txt

@@ -124,6 +124,7 @@ file(
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/funcs/math/*.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/funcs/eigen/*.cu
   # kernels/gpu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/ctc_align_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/yolo_box_post_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/spectral_norm_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/spectral_norm_kernel.cu
@@ -300,6 +301,8 @@ file(
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/broadcast_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/decayed_adagrad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/debug_tools_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/deformable_conv_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/deformable_conv_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/cumprod_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/cumprod_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/crop_grad_kernel.cu

backends/metax_gpu/kernels/cuda_kernels/ctc_align_kernel_register.cu

@@ -13,8 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/ctc_align_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/ctc_align_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(
-    ctc_align, metax_gpu, ALL_LAYOUT, phi::CTCAlignOpCUDAKernel, int, int64_t) {
-}
+    ctc_align, metax_gpu, ALL_LAYOUT, phi::CTCAlignKernel, int, int64_t) {}

backends/metax_gpu/kernels/cuda_kernels/deformable_conv_grad_kernel_register.cu

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/phi/kernels/gpu/deformable_conv_grad_kernel.cu"  // NOLINT
+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/deformable_conv_grad_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(deformable_conv_grad,
                           metax_gpu,

backends/metax_gpu/kernels/cuda_kernels/deformable_conv_kernel_register.cu

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/deformable_conv_kernel.cu"  // NOLINT
+#include "paddle/phi/kernels/deformable_conv_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(deformable_conv,
                           metax_gpu,