[XPU]Fix Option to Enable/Disable xpufft Build (#72734)

fangfangssj · web-flow · commit 70ce915c61d7 · 2025-05-16T16:55:02.000+08:00
* fix_cmake

* fix

* ci

* ci
diff --git a/cmake/phi.cmake b/cmake/phi.cmake
@@ -110,13 +110,6 @@ function(kernel_declare TARGET_LIST)
           set(first_registry "")
         endif()
       endif()
-      # The kernel related to xpufft must have WITH_XPU_FFT enabled.
-      if(WITH_XPU AND NOT WITH_XPU_FFT)
-        string(FIND "${first_registry}" "xpufft" pos)
-        if(pos GREATER 1)
-          set(first_registry "")
-        endif()
-      endif()
 
       if(NOT first_registry STREQUAL "")
         string(
@@ -148,7 +141,6 @@ function(kernel_declare TARGET_LIST)
         string(REPLACE "," ";" kernel_msg "${kernel_msg}")
         string(REGEX REPLACE "[ \\\t\r\n]+" "" kernel_msg "${kernel_msg}")
         string(REGEX REPLACE "//cuda_only" "" kernel_msg "${kernel_msg}")
-        string(REGEX REPLACE "//xpufft" "" kernel_msg "${kernel_msg}")
 
         list(GET kernel_msg 0 kernel_name)
         if(NOT is_all_backend STREQUAL "")
diff --git a/paddle/phi/backends/xpu/xpu3_op_list.cc b/paddle/phi/backends/xpu/xpu3_op_list.cc
@@ -1824,7 +1824,15 @@ XPUOpMap& get_kl3_ops() {
                      phi::DataType::INT64,
                      phi::DataType::INT32})},
 #ifdef PADDLE_WITH_XPU_FFT
-      {"conj", XPUKernelSet({phi::DataType::COMPLEX64})},
+      {"conj",
+       XPUKernelSet({phi::DataType::FLOAT32,
+                     phi::DataType::FLOAT16,
+                     phi::DataType::BFLOAT16,
+                     phi::DataType::FLOAT64,
+                     phi::DataType::BOOL,
+                     phi::DataType::INT64,
+                     phi::DataType::INT32,
+                     phi::DataType::COMPLEX64})},
       {"real", XPUKernelSet({phi::DataType::COMPLEX64})},
       {"real_grad", XPUKernelSet({phi::DataType::COMPLEX64})},
       {"imag", XPUKernelSet({phi::DataType::COMPLEX64})},
diff --git a/paddle/phi/kernels/CMakeLists.txt b/paddle/phi/kernels/CMakeLists.txt
@@ -325,8 +325,14 @@ if(WITH_XPU)
     file(GLOB_RECURSE kernel_xpu_cc "${CMAKE_CURRENT_BINARY_DIR}/*.cc")
     collect_generated_srcs(kernels_srcs SRCS ${kernel_xpu_cc})
     set(kernel_cc "")
+  endif()
 
+  # The kernel related to xpufft must have WITH_XPU_FFT enabled.
+  if(NOT WITH_XPU_FFT)
+    list(REMOVE_ITEM kernel_xpu "xpu/complex_kernel.cc"
+         "xpu/complex_grad_kernel.cc")
   endif()
+
   collect_srcs(kernels_srcs SRCS ${kernel_xpu})
   kernel_declare("${kernel_xpu}")
   kernel_declare("${kernel_xpu_kps}")
diff --git a/paddle/phi/kernels/xpu/complex_grad_kernel.cc b/paddle/phi/kernels/xpu/complex_grad_kernel.cc
@@ -117,27 +117,24 @@ void ComplexGradKernel(const Context& dev_ctx,
 }
 }  // namespace phi
 
-PD_REGISTER_KERNEL(imag_grad,  // xpufft
+PD_REGISTER_KERNEL(imag_grad,
                    XPU,
                    ALL_LAYOUT,
                    phi::ImagGradKernel,
                    phi::dtype::complex<float>) {
   kernel->InputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
 }
 
-PD_REGISTER_KERNEL(real_grad,  // xpufft
+PD_REGISTER_KERNEL(real_grad,
                    XPU,
                    ALL_LAYOUT,
                    phi::RealGradKernel,
                    phi::dtype::complex<float>) {
   kernel->InputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
 }
 
-PD_REGISTER_KERNEL(complex_grad,  // xpufft
-                   XPU,
-                   ALL_LAYOUT,
-                   phi::ComplexGradKernel,
-                   float) {
+PD_REGISTER_KERNEL(
+    complex_grad, XPU, ALL_LAYOUT, phi::ComplexGradKernel, float) {
   kernel->InputAt(2).SetDataType(phi::dtype::ToComplex(kernel_key.dtype()));
 }
 #endif  // PADDLE_WITH_XPU_FFT
diff --git a/paddle/phi/kernels/xpu/complex_kernel.cc b/paddle/phi/kernels/xpu/complex_kernel.cc
@@ -36,7 +36,7 @@ void ConjKernel(const Context& dev_ctx,
                 const DenseTensor& x,
                 DenseTensor* out) {
   dev_ctx.template Alloc<T>(out);
-  if (std::is_same<T, phi::dtype::complex<float>>::value) {
+  if (std::is_same_v<T, phi::dtype::complex<float>>) {
     int r = xfft_internal::xpu::Conj(
         x.numel(),
         reinterpret_cast<cuFloatComplex*>(const_cast<T*>(x.data<T>())),
@@ -132,7 +132,7 @@ void ComplexKernel(const Context& dev_ctx,
 }
 }  // namespace phi
 
-PD_REGISTER_KERNEL(conj,  // xpufft
+PD_REGISTER_KERNEL(conj,
                    XPU,
                    ALL_LAYOUT,
                    phi::ConjKernel,
@@ -145,27 +145,17 @@ PD_REGISTER_KERNEL(conj,  // xpufft
                    phi::dtype::bfloat16,
                    phi::dtype::complex<float>) {}
 
-PD_REGISTER_KERNEL(real,  // xpufft
-                   XPU,
-                   ALL_LAYOUT,
-                   phi::RealKernel,
-                   phi::dtype::complex<float>) {
+PD_REGISTER_KERNEL(
+    real, XPU, ALL_LAYOUT, phi::RealKernel, phi::dtype::complex<float>) {
   kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
 }
 
-PD_REGISTER_KERNEL(imag,  // xpufft
-                   XPU,
-                   ALL_LAYOUT,
-                   phi::ImagKernel,
-                   phi::dtype::complex<float>) {
+PD_REGISTER_KERNEL(
+    imag, XPU, ALL_LAYOUT, phi::ImagKernel, phi::dtype::complex<float>) {
   kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
 }
 
-PD_REGISTER_KERNEL(complex,  // xpufft
-                   XPU,
-                   ALL_LAYOUT,
-                   phi::ComplexKernel,
-                   float) {
+PD_REGISTER_KERNEL(complex, XPU, ALL_LAYOUT, phi::ComplexKernel, float) {
   kernel->OutputAt(0).SetDataType(phi::dtype::ToComplex(kernel_key.dtype()));
 }
 #endif  // PADDLE_WITH_XPU_FFT
diff --git a/test/xpu/xpu_op_test b/test/xpu/xpu_op_test
