Skip to content

Commit 8fa625c

Browse files
First stage of add DSP FFT (#5878)
* set fft_dsp * add information in map * update Global_rank * update control flow * [pre-commit.ci lite] apply automatic fixes * add the fft_dsp in the fft_bundle * change teh cmake file * modify back scalapck * set the dsp ig2ixyz_k_cpu * modify the pw_basis * add the namespace * remove mutable * fix fft_dsp * add the convolution and allocate or destroy the b_id --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent bcca5b3 commit 8fa625c

File tree

21 files changed

+1896
-799
lines changed

21 files changed

+1896
-799
lines changed

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,12 @@ if(ENABLE_MPI)
262262
endif()
263263

264264
if (USE_DSP)
265-
target_link_libraries(${ABACUS_BIN_NAME} ${DIR_MTBLAS_LIBRARY})
266265
add_compile_definitions(__DSP)
266+
target_link_libraries(${ABACUS_BIN_NAME} ${OMPI_LIBRARY1})
267+
include_directories(${MTBLAS_FFT_DIR}/libmtblas/include)
268+
include_directories(${MT_HOST_DIR}/include)
269+
target_link_libraries(${ABACUS_BIN_NAME} ${MT_HOST_DIR}/hthreads/lib/libhthread_device.a)
270+
target_link_libraries(${ABACUS_BIN_NAME} ${MT_HOST_DIR}/hthreads/lib/libhthread_host.a)
267271
endif()
268272

269273
find_package(Threads REQUIRED)
@@ -434,10 +438,8 @@ else()
434438
find_package(Lapack REQUIRED)
435439
include_directories(${FFTW3_INCLUDE_DIRS})
436440
list(APPEND math_libs FFTW3::FFTW3 LAPACK::LAPACK BLAS::BLAS)
437-
438441
find_package(ScaLAPACK REQUIRED)
439442
list(APPEND math_libs ScaLAPACK::ScaLAPACK)
440-
441443
if(USE_OPENMP)
442444
list(APPEND math_libs FFTW3::FFTW3_OMP)
443445
endif()

source/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ if(USE_ROCM)
104104
)
105105
endif()
106106

107+
if(USE_DSP)
108+
list(APPEND device_srcs
109+
module_base/kernels/dsp/dsp_connector.cpp
110+
)
111+
endif()
112+
113+
107114
add_library(device OBJECT ${device_srcs})
108115

109116
if(USE_CUDA)

source/module_base/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ add_library(
6565
)
6666

6767
target_link_libraries(base PUBLIC container)
68-
68+
if (USE_DSP)
69+
target_link_libraries(base PUBLIC ${MTBLAS_FFT_DIR}/libmtblas/lib/libmtblas.a)
70+
target_link_libraries(base PUBLIC ${MTBLAS_FFT_DIR}/libmtblas/lib/libmtblasdev.a)
71+
endif()
6972
add_subdirectory(module_container)
7073

7174
if(ENABLE_COVERAGE)

0 commit comments

Comments
 (0)