From e2d48b4ed45f727e972d3466a2453f9a30bd9d03 Mon Sep 17 00:00:00 2001
From: Le-soleile <3516093767@qq.com>
Date: Wed, 19 Nov 2025 14:32:38 +0000
Subject: [PATCH 1/4] fix

---
 .../kernels/cuda_kernels/global_gather_kernel_register.cu    | 2 +-
 .../kernels/cuda_kernels/global_scatter_kernel_register.cu   | 2 +-
 .../kernels/cuda_kernels/l1_norm_grad_kernel_register.cu     | 2 +-
 .../cuda_kernels/lookup_table_grad_kernel_register.cu        | 2 +-
 .../kernels/cuda_kernels/lookup_table_kernel_register.cu     | 2 +-
 backends/metax_gpu/CMakeLists.txt                            | 5 +++++
 .../kernels/cuda_kernels/global_gather_kernel_register.cu    | 2 +-
 .../kernels/cuda_kernels/global_scatter_kernel_register.cu   | 2 +-
 .../kernels/cuda_kernels/l1_norm_grad_kernel_register.cu     | 2 +-
 .../cuda_kernels/lookup_table_grad_kernel_register.cu        | 2 +-
 .../kernels/cuda_kernels/lookup_table_kernel_register.cu     | 2 +-
 11 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
index bbeaa102739..6ee6c05beb4 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/global_gather_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/global_gather_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(global_gather,
                           iluvatar_gpu,
diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
index e2fe3370d21..3ffa0f40304 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/global_scatter_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/global_scatter_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(global_scatter,
                           iluvatar_gpu,
diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
index 201f4caee65..042e5d5b34e 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.cu"  // NOLINT
+#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(
     l1_norm_grad, iluvatar_gpu, ALL_LAYOUT, phi::L1NormGradKernel, float) {}
diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
index 5535637b352..9ad91bf58af 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/lookup_table_grad_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/lookup_table_grad_kernel.h"
 PD_CUSTOM_KERNEL_REGISTER(lookup_table_grad,
                           iluvatar_gpu,
                           ALL_LAYOUT,
diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
index 30b58c16f63..b0a96e2bf0c 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/lookup_table_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/lookup_table_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(lookup_table,
                           iluvatar_gpu,
diff --git a/backends/metax_gpu/CMakeLists.txt b/backends/metax_gpu/CMakeLists.txt
index 6048b59e6c1..346c683af70 100755
--- a/backends/metax_gpu/CMakeLists.txt
+++ b/backends/metax_gpu/CMakeLists.txt
@@ -118,6 +118,11 @@ 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/lookup_table_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/lookup_table_grad_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/l1_norm_grad_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/global_scatter_kernel.cu
+  ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/global_gather_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/activation_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/activation_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/adamw_kernel.cu
diff --git a/backends/metax_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
index c24af944a1c..1cc3e79e11d 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/global_gather_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/global_gather_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/global_gather_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(global_gather,
                           metax_gpu,
diff --git a/backends/metax_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
index 2494d27dd37..8a178fe1bf0 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/global_scatter_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/global_scatter_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/global_scatter_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(global_scatter,
                           metax_gpu,
diff --git a/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
index 1ce5a014850..8ec95a15d67 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.cu"  // NOLINT
+#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(
     l1_norm_grad, metax_gpu, ALL_LAYOUT, phi::L1NormGradKernel, float) {}
diff --git a/backends/metax_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
index 484d7cfe1e0..6f9a9c0b51c 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/lookup_table_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/lookup_table_grad_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/lookup_table_grad_kernel.h"
 PD_CUSTOM_KERNEL_REGISTER(lookup_table_grad,
                           metax_gpu,
                           ALL_LAYOUT,
diff --git a/backends/metax_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
index 42d83c3adf6..1caffe5644b 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/lookup_table_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/lookup_table_kernel.cu"  //NOLINT
+#include "paddle/phi/kernels/gpu/lookup_table_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(lookup_table,
                           metax_gpu,

From 24965a6c7706f25e1a5dbeb77706f44b0cc170ab Mon Sep 17 00:00:00 2001
From: Le-soleile <3516093767@qq.com>
Date: Sat, 29 Nov 2025 13:17:21 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernels/cuda_kernels/l1_norm_grad_kernel_register.cu        | 2 +-
 .../kernels/cuda_kernels/l1_norm_grad_kernel_register.cu        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
index 042e5d5b34e..a8a17fde61d 100644
--- a/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
+++ b/backends/iluvatar_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.h"
+#include "paddle/phi/kernels/l1_norm_grad_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(
     l1_norm_grad, iluvatar_gpu, ALL_LAYOUT, phi::L1NormGradKernel, float) {}
diff --git a/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
index 8ec95a15d67..d588ad1aa0b 100644
--- a/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
+++ b/backends/metax_gpu/kernels/cuda_kernels/l1_norm_grad_kernel_register.cu
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/kernels/gpu/l1_norm_grad_kernel.h"
+#include "paddle/phi/kernels/l1_norm_grad_kernel.h"
 
 PD_CUSTOM_KERNEL_REGISTER(
     l1_norm_grad, metax_gpu, ALL_LAYOUT, phi::L1NormGradKernel, float) {}

From fa9ca7346ae189f3a9dd0c1bca0ba15f0f614375 Mon Sep 17 00:00:00 2001
From: Le-soleile <3516093767@qq.com>
Date: Fri, 5 Dec 2025 11:04:49 +0000
Subject: [PATCH 3/4] fix

---
 backends/metax_gpu/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/metax_gpu/CMakeLists.txt b/backends/metax_gpu/CMakeLists.txt
index 8831bdb9a09..5b9fc3f4243 100755
--- a/backends/metax_gpu/CMakeLists.txt
+++ b/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/l1_norm_grad_kernel_register.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/lookup_table_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/lookup_table_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/l1_norm_grad_kernel.cu

From 6f8b76fe5b2c88b5a0685f4884978b0f2f7472ae Mon Sep 17 00:00:00 2001
From: Yami <156195357+Le-soleile@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:46:21 +0800
Subject: [PATCH 4/4] Update CMakeLists.txt

---
 backends/metax_gpu/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backends/metax_gpu/CMakeLists.txt b/backends/metax_gpu/CMakeLists.txt
index 1a8be9c8155..bc14db619f9 100755
--- a/backends/metax_gpu/CMakeLists.txt
+++ b/backends/metax_gpu/CMakeLists.txt
@@ -124,7 +124,6 @@ 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/l1_norm_grad_kernel_register.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/lookup_table_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/lookup_table_grad_kernel.cu
   ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/l1_norm_grad_kernel.cu