From 26142dfcbff2bd8c2ed5365a6745dfdc55b4841b Mon Sep 17 00:00:00 2001 From: LiaoYFBH <2273398935@qq.com> Date: Thu, 4 Dec 2025 12:15:29 +0800 Subject: [PATCH 1/2] Standardize compare kernel and update backends/iluvatar_gpu/CMakeLists.txt --- backends/iluvatar_gpu/CMakeLists.txt | 2 -- .../iluvatar_gpu/kernels/cuda_kernels/reduce_kernel_register.cc | 2 +- .../metax_gpu/kernels/cuda_kernels/reduce_kernel_register.cu | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/backends/iluvatar_gpu/CMakeLists.txt b/backends/iluvatar_gpu/CMakeLists.txt index 42ae09c147a..8c67c6951a6 100644 --- a/backends/iluvatar_gpu/CMakeLists.txt +++ b/backends/iluvatar_gpu/CMakeLists.txt @@ -192,7 +192,6 @@ file( ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/pool_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/put_along_axis_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/randint_kernel.cu - ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/reduce_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/rms_norm_grad_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/rms_norm_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/roi_align_kernel.cu @@ -368,7 +367,6 @@ file( ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/partial_send_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/psroi_pool_grad_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/quantize_linear_kernel.cu - ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/reduce_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/repeat_interleave_grad_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/repeat_interleave_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/rmsprop_kernel.cu diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/reduce_kernel_register.cc b/backends/iluvatar_gpu/kernels/cuda_kernels/reduce_kernel_register.cc index ef288438bca..fdc1844a2d3 100644 --- a/backends/iluvatar_gpu/kernels/cuda_kernels/reduce_kernel_register.cc +++ b/backends/iluvatar_gpu/kernels/cuda_kernels/reduce_kernel_register.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/gpu/reduce_kernel.cu" // NOLINT +#include "paddle/phi/kernels/reduce_kernel.h" // NOLINT PD_CUSTOM_KERNEL_REGISTER(reduce, iluvatar_gpu, diff --git a/backends/metax_gpu/kernels/cuda_kernels/reduce_kernel_register.cu b/backends/metax_gpu/kernels/cuda_kernels/reduce_kernel_register.cu index bccff5948d5..ddc949e7f4b 100644 --- a/backends/metax_gpu/kernels/cuda_kernels/reduce_kernel_register.cu +++ b/backends/metax_gpu/kernels/cuda_kernels/reduce_kernel_register.cu @@ -14,7 +14,6 @@ // limitations under the License. #include "paddle/phi/core/kernel_registry.h" -#include "paddle/phi/kernels/gpu/reduce_kernel.cu" // NOLINT #include "paddle/phi/kernels/reduce_kernel.h" PD_CUSTOM_KERNEL_REGISTER(reduce, From 0b1a77d1af6c21725e7b3828efd99da9cbf7793a Mon Sep 17 00:00:00 2001 From: LiaoYFBH <2273398935@qq.com> Date: Thu, 4 Dec 2025 12:15:59 +0800 Subject: [PATCH 2/2] Standardize compare kernel and update backends/iluvatar_gpu/CMakeLists.txt --- backends/iluvatar_gpu/CMakeLists.txt | 2 -- .../kernels/cuda_kernels/compare_kernel_legacy_register.cu | 1 - .../kernels/cuda_kernels/compare_kernel_legacy_register.cu | 1 - 3 files changed, 4 deletions(-) diff --git a/backends/iluvatar_gpu/CMakeLists.txt b/backends/iluvatar_gpu/CMakeLists.txt index 8c67c6951a6..0e631f25b6c 100644 --- a/backends/iluvatar_gpu/CMakeLists.txt +++ b/backends/iluvatar_gpu/CMakeLists.txt @@ -389,7 +389,6 @@ file( ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/kps/elementwise_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/legacy/gpu/fp8_quant_blockwise_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/legacy/gpu/moe_combine_no_weight_kernel.cu - ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/legacy/kps/compare_kernel.cu # kernels/gpu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/activation_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/activation_grad_kernel.cu @@ -427,7 +426,6 @@ file( ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/scatter_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/scatter_grad_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/dist_kernel.cu - ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/legacy/kps/compare_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/kps/compare_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/cum_kernel.cu ${PADDLE_SOURCE_DIR}/paddle/phi/kernels/gpu/cum_grad_kernel.cu diff --git a/backends/iluvatar_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu b/backends/iluvatar_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu index 0dcfdd6b980..d028732c7a7 100644 --- a/backends/iluvatar_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu +++ b/backends/iluvatar_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu @@ -16,7 +16,6 @@ #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/kernels/legacy/compare_kernel.h" -// #include "paddle/phi/kernels/legacy/kps/compare_kernel.cu" // NOLINT PD_CUSTOM_KERNEL_REGISTER(less_than_raw, iluvatar_gpu, diff --git a/backends/metax_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu b/backends/metax_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu index 26760617091..bf3ebde09b5 100644 --- a/backends/metax_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu +++ b/backends/metax_gpu/kernels/cuda_kernels/compare_kernel_legacy_register.cu @@ -17,7 +17,6 @@ #include "paddle/phi/core/kernel_registry.h" #include "paddle/phi/kernels/legacy/compare_kernel.h" -// #include "paddle/phi/kernels/legacy/kps/compare_kernel.cu" // NOLINT PD_CUSTOM_KERNEL_REGISTER(less_than_raw, metax_gpu,