add cmake

Author: fangfangssj

CMakeLists.txt

@@ -56,6 +56,7 @@ option(WITH_XPU_KP "Compile PaddlePaddle with BAIDU XPU compiler " OFF)
 option(WITH_XPU_XFT "Compile PaddlePaddle with BAIDU XPU-XFT" OFF)
 option(WITH_XPU_PLUGIN "Compile PaddlePaddle with BAIDU XPU plugin" OFF)
 option(WITH_XPU_XRE5 "Compile PaddlePaddle with BAIDU XPU XRE 5" OFF)
+option(WITH_XPU_FFT "Compile PaddlePaddle with BAIDU XPU FFT" OFF)
 option(WITH_WIN_DUMP_DBG "Compile with windows core dump debug mode" OFF)
 option(WITH_ROCM "Compile PaddlePaddle with ROCM platform" OFF)
 option(WITH_IPU "Compile PaddlePaddle with Graphcore IPU" OFF)
@@ -95,6 +96,9 @@ endif()
 if(WITH_GPU AND WITH_XPU_XRE5)
   message(FATAL_ERROR "Error when compile GPU and XPU-XRE5 at the same time")
 endif()
+if(WITH_GPU AND WITH_XPU_FFT)
+  message(FATAL_ERROR "Error when compile GPU and XPU-FFT at the same time")
+endif()
 if(WITH_GPU AND WITH_ROCM)
   message(FATAL_ERROR "Error when compile CUDA and ROCM at the same time")
 endif()
@@ -478,6 +482,14 @@ if(NOT WITH_XPU AND WITH_XPU_XRE5)
       CACHE STRING "Disable XRE5 when compiling without XPU" FORCE)
 endif()
 
+if(NOT WITH_XPU AND WITH_XPU_FFT)
+  message((WARNING
+           "Disable FFT when compiling without XPU. Force WITH_XPU_FFT=OFF"))
+  set(WITH_XPU_FFT
+      OFF
+      CACHE STRING "Disable FFT when compiling without XPU" FORCE)
+endif()
+
 if(WITH_NCCL)
   add_definitions("-DPADDLE_WITH_NCCL")
   include(nccl)

cmake/external/xpu.cmake

@@ -28,6 +28,7 @@ set(XPU_XPTI_LIB_NAME "libxpti.so")
 set(XPU_XBLAS_LIB_NAME "libxpu_blas.so")
 set(XPU_XFA_LIB_NAME "libxpu_flash_attention.so")
 set(XPU_XPUDNN_LIB_NAME "libxpu_dnn.so")
+set(XPU_FFT_LIB_NAME "libcufft.so")
 
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
   set(XPU_XHPC_BASE_DATE "dev/20250417")
@@ -81,6 +82,11 @@ if(WITH_XPU_XRE5)
   )
 endif()
 
+if(WITH_XPU_FFT)
+  set(XPU_FFT_BASE_URL "https://paddle-org.bj.bcebos.com/paddlescience")
+  set(XPU_FFT_DIR_NAME "xpufft")
+endif()
+
 if(WITH_AARCH64)
   set(XPU_XRE_DIR_NAME "xre-kylin_aarch64")
   set(XPU_XCCL_DIR_NAME "") # TODO: xccl has no kylin output now.
@@ -130,6 +136,10 @@ if(WITH_XPTI)
   set(XPU_XPTI_URL "${XPU_XPTI_BASE_URL}/${XPU_XPTI_DIR_NAME}.tar.gz")
 endif()
 
+if(WITH_XPU_FFT)
+  set(XPU_FFT_URL "${XPU_FFT_BASE_URL}/${XPU_FFT_DIR_NAME}.tar.gz")
+endif()
+
 set(XPU_XHPC_URL
     "https://klx-sdk-release-public.su.bcebos.com/xhpc/${XPU_XHPC_BASE_DATE}/${XPU_XHPC_DIR_NAME}.tar.gz"
     CACHE STRING "" FORCE)
@@ -154,6 +164,7 @@ set(XPU_CUDA_RT_LIB "${XPU_LIB_DIR}/${XPU_CUDA_RT_LIB_NAME}")
 set(XPU_ML_LIB "${XPU_LIB_DIR}/${XPU_ML_LIB_NAME}")
 set(XPU_XFA_LIB "${XPU_LIB_DIR}/${XPU_XFA_LIB_NAME}")
 set(XPU_XPUDNN_LIB "${XPU_LIB_DIR}/${XPU_XPUDNN_LIB_NAME}")
+set(XPU_FFT_LIB "${XPU_LIB_DIR}/${XPU_FFT_LIB_NAME}")
 
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}" "${XPU_INSTALL_DIR}/lib")
 
@@ -205,6 +216,12 @@ if(DEFINED ENV{XPU_LIB_ROOT})
     set(XFT_COMMAND
         "${CMAKE_SOURCE_DIR}/tools/xpu/get_xft_dependence_from_custom_path.sh")
   endif()
+
+  # FFT
+  if(DEFINED ENV{XPU_FFT_DIR_NAME})
+    set(XPU_FFT_URL "${XPU_LIB_ROOT}/$ENV{XPU_FFT_DIR_NAME}")
+    set(XPU_FFT_DIR_NAME "$ENV{XPU_FFT_DIR_NAME}")
+  endif()
 endif()
 
 if(WITH_XPU_XRE5)
@@ -216,8 +233,9 @@ if(WITH_XPU_XRE5)
     DOWNLOAD_COMMAND
       bash ${CMAKE_SOURCE_DIR}/tools/xpu/pack_paddle_dependence.sh
       ${XPU_XRE_URL} ${XPU_XRE_DIR_NAME} ${XPU_XHPC_URL} ${XPU_XHPC_DIR_NAME}
-      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 1 && wget ${XPU_XFT_GET_DEPENCE_URL}
-      && bash ${XFT_COMMAND} ${XPU_XFT_URL} ${XPU_XFT_DIR_NAME} && bash
+      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} ${XPU_FFT_URL} ${XPU_FFT_DIR_NAME} 1
+      && wget ${XPU_XFT_GET_DEPENCE_URL} && bash ${XFT_COMMAND} ${XPU_XFT_URL}
+      ${XPU_XFT_DIR_NAME} && bash
       ${CMAKE_SOURCE_DIR}/tools/xpu/get_xpti_dependence.sh ${XPU_XPTI_URL}
       ${XPU_XPTI_DIR_NAME}
     DOWNLOAD_NO_PROGRESS 1
@@ -231,7 +249,8 @@ if(WITH_XPU_XRE5)
     BUILD_BYPRODUCTS ${XPU_RT_LIB}
     BUILD_BYPRODUCTS ${XPU_CUDA_RT_LIB}
     BUILD_BYPRODUCTS ${XPU_ML_LIB}
-    BUILD_BYPRODUCTS ${XPU_BKCL_LIB})
+    BUILD_BYPRODUCTS ${XPU_BKCL_LIB}
+    BUILD_BYPRODUCTS ${XPU_FFT_LIB})
 else()
   ExternalProject_Add(
     ${XPU_PROJECT}
@@ -241,8 +260,9 @@ else()
     DOWNLOAD_COMMAND
       bash ${CMAKE_SOURCE_DIR}/tools/xpu/pack_paddle_dependence.sh
       ${XPU_XRE_URL} ${XPU_XRE_DIR_NAME} ${XPU_XHPC_URL} ${XPU_XHPC_DIR_NAME}
-      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} 0 && wget ${XPU_XFT_GET_DEPENCE_URL}
-      && bash get_xft_dependence.sh ${XPU_XFT_URL} ${XPU_XFT_DIR_NAME} && bash
+      ${XPU_XCCL_URL} ${XPU_XCCL_DIR_NAME} ${XPU_FFT_URL} ${XPU_FFT_DIR_NAME} 0
+      && wget ${XPU_XFT_GET_DEPENCE_URL} && bash get_xft_dependence.sh
+      ${XPU_XFT_URL} ${XPU_XFT_DIR_NAME} && bash
       ${CMAKE_SOURCE_DIR}/tools/xpu/get_xpti_dependence.sh ${XPU_XPTI_URL}
       ${XPU_XPTI_DIR_NAME}
     DOWNLOAD_NO_PROGRESS 1
@@ -272,6 +292,16 @@ if(WITH_XPU_XFT)
   target_link_libraries(xpulib ${XPU_XFT_LIB})
 endif()
 
+if(WITH_XPU_FFT)
+  message(STATUS "Compile with XPU FFT!")
+  add_definitions(-DPADDLE_WITH_XPU_FFT)
+
+  set(XPU_FFT_INC_DIR "${XPU_INC_DIR}/fft")
+  include_directories(${XPU_FFT_INC_DIR})
+  set(XPU_FFT_LIB "${XPU_LIB_DIR}/${XPU_FFT_LIB_NAME}")
+  target_link_libraries(xpulib ${XPU_FFT_LIB})
+endif()
+
 set(XPU_XHPC_INC_DIR "${XPU_INC_DIR}/xhpc")
 include_directories(${XPU_XHPC_INC_DIR})
 set(XPU_XRE_INC_DIR "${XPU_INC_DIR}/xre")

python/env_dict.py.in

@@ -70,6 +70,9 @@ env_dict={
     'XPU_CUDA_LIB':'@XPU_CUDA_LIB@',
     'XPU_CUDA_LIB_NAME':'@XPU_CUDA_LIB_NAME@',
     'WITH_XPU_XRE5':'@WITH_XPU_XRE5@',
+    'WITH_XPU_FFT':'@WITH_XPU_FFT@',
+    'XPU_FFT_LIB':'@XPU_FFT_LIB@',
+    'XPU_FFT_LIB_NAME':'@XPU_FFT_LIB_NAME@',
     'XPU_CUDA_RT_LIB':'@XPU_CUDA_RT_LIB@',
     'XPU_CUDA_RT_LIB_NAME':'@XPU_CUDA_RT_LIB_NAME@',
     'XPU_ML_LIB':'@XPU_ML_LIB@',

python/setup.py.in

@@ -1146,6 +1146,10 @@ if '${WITH_XPU_XFT}' == 'ON':
     shutil.copy('${XPU_XFT_LIB}', libs_path)
     package_data['paddle.libs']+=['${XPU_XFT_LIB_NAME}']
 
+if '${WITH_XPU_FFT}' == 'ON':
+    shutil.copy('${XPU_FFT_LIB}', libs_path)
+    package_data['paddle.libs']+=['${XPU_FFT_LIB_NAME}']
+
 if '${WITH_XPTI}' == 'ON':
     shutil.copy('${XPU_XPTI_LIB}', libs_path)
     package_data['paddle.libs']+=['${XPU_XPTI_LIB_NAME}']

setup.py

@@ -1607,6 +1607,10 @@ def get_package_data_and_package_dir():
         shutil.copy(env_dict.get("XPU_BKCL_LIB"), libs_path)
         package_data['paddle.libs'] += [env_dict.get("XPU_BKCL_LIB_NAME")]
 
+    if env_dict.get("WITH_XPU_FFT") == 'ON':
+        shutil.copy(env_dict.get("XPU_FFT_LIB"), libs_path)
+        package_data['paddle.libs'] += [env_dict.get("XPU_FFT_LIB_NAME")]
+
     if env_dict.get("WITH_XPU_XFT") == 'ON':
         shutil.copy(env_dict.get("XPU_XFT_LIB"), libs_path)
         package_data['paddle.libs'] += [env_dict.get("XPU_XFT_LIB_NAME")]

tools/xpu/pack_paddle_dependence.sh

@@ -26,11 +26,15 @@ XHPC_DIR_NAME=$4
 XCCL_URL=$5
 XCCL_DIR_NAME=$6
 
-WITH_XPU_XRE5=$7
+XFFT_URL=$7
+XFFT_DIR_NAME=$8
+
+WITH_XPU_XRE5=$9
 
 mkdir -p xpu/include/xhpc/xblas
 mkdir -p xpu/include/xhpc/xfa
 mkdir -p xpu/include/xhpc/xpudnn
+mkdir -p xpu/include/xfft
 mkdir -p xpu/include/xpu
 mkdir -p xpu/include/xre
 mkdir -p xpu/lib
@@ -99,6 +103,13 @@ function xccl_prepare() {
   patchelf --set-rpath '$ORIGIN/' xpu/lib/libbkcl.so
 }
 
+function xfft_prepare() {
+  check_files ${XFFT_DIR_NAME}/include/cufft.h ${XFFT_DIR_NAME}/lib64/libcufft.so
+  cp -r ${XFFT_DIR_NAME}/include/* xpu/include/xpu/
+  cp -r ${XFFT_DIR_NAME}/lib64/* xpu/lib/
+  cp -r ${XFFT_DIR_NAME}/include/* xpu/include/xfft
+}
+
 function local_prepare() {
     # xre prepare
     if [[ ! -d ${LOCAL_PATH}/${XRE_DIR_NAME} ]]; then
@@ -117,6 +128,12 @@ function local_prepare() {
         XHPC_TAR_NAME=${XHPC_DIR_NAME}.tar.gz
         tar -zxf  ${LOCAL_PATH}/${XHPC_TAR_NAME} -C ${LOCAL_PATH}
     fi
+
+    # xfft prepare
+    if [[ ! -d ${LOCAL_PATH}/${XFFT_DIR_NAME} ]]; then
+        XFFT_TAR_NAME=${XFFT_DIR_NAME}.tar.gz
+        tar -zxf  ${LOCAL_PATH}/${XFFT_TAR_NAME} -C ${LOCAL_PATH}
+    fi
 }
 
 function local_assemble() {
@@ -129,6 +146,11 @@ function local_assemble() {
     cp -r ${LOCAL_PATH}/$XCCL_DIR_NAME/include/* xpu/include/xpu/
     cp -r ${LOCAL_PATH}/$XCCL_DIR_NAME/so/* xpu/lib/
 
+    # xfft assemble
+    cp -r ${LOCAL_PATH}/$XFFT_DIR_NAME/include/* xpu/include/xpu/
+    cp -r ${LOCAL_PATH}/$XFFT_DIR_NAME/so/* xpu/lib/
+    cp -r ${LOCAL_PATH}/$XFFT_DIR_NAME/include/* xpu/include/xfft
+
     # xhpc assemble
     cp -r ${LOCAL_PATH}/${XHPC_DIR_NAME}/xdnn/include/* xpu/include/
     cp -r ${LOCAL_PATH}/${XHPC_DIR_NAME}/xdnn/so/libxpuapi.so xpu/lib
@@ -161,7 +183,9 @@ else
     download_from_bos ${XRE_URL}
     download_from_bos ${XHPC_URL}
     download_from_bos ${XCCL_URL}
+    download_from_bos ${XFFT_URL}
     xre_prepare
     xhpc_prepare
     xccl_prepare
+    xfft_prepare
 fi