Added LMP_HEFFTE to CMakeLists.txt to attempt to fix a merge conflict

This commit is contained in:
Nick Hagerty
2023-12-18 12:11:31 -05:00
parent d02ffb0e70
commit bc7050ab50

View File

@ -971,20 +971,40 @@ if(PKG_KOKKOS)
endif() endif()
endif() endif()
if(PKG_KSPACE) if(PKG_KSPACE)
message(STATUS "<<< FFT settings >>> if (LMP_HEFFTE)
message(STATUS "<<< FFT settings >>>
-- Primary FFT lib: heFFTe")
if (HEFFTE_BACKEND)
message(STATUS "heFFTe backend: ${HEFFTE_BACKEND}")
else()
message(STATUS "heFFTe backend: stock (builtin FFT implementation, tested for corrected but not optimized for production)")
endif()
if(FFT_SINGLE)
message(STATUS "Using single precision FFTs")
else()
message(STATUS "Using double precision FFTs")
endif()
else()
message(STATUS "<<< FFT settings >>>
-- Primary FFT lib: ${FFT}") -- Primary FFT lib: ${FFT}")
if(FFT_SINGLE) if(FFT_SINGLE)
message(STATUS "Using single precision FFTs") message(STATUS "Using single precision FFTs")
else() else()
message(STATUS "Using double precision FFTs") message(STATUS "Using double precision FFTs")
endif() endif()
if(FFT_FFTW_THREADS OR FFT_MKL_THREADS) if(FFT_FFTW_THREADS OR FFT_MKL_THREADS)
message(STATUS "Using threaded FFTs") message(STATUS "Using threaded FFTs")
else() else()
message(STATUS "Using non-threaded FFTs") message(STATUS "Using non-threaded FFTs")
endif() endif()
if(PKG_KOKKOS) if (FFT_HEFFTE)
message(STATUS "Kokkos FFT: ${FFT_KOKKOS}") message(STATUS "Using distributed algorithms from heFTTe")
else()
message(STATUS "Using builtin distributed algorithms")
endif()
if(PKG_KOKKOS)
message(STATUS "Kokkos FFT: ${FFT_KOKKOS}")
endif()
endif() endif()
endif() endif()
if(BUILD_DOC) if(BUILD_DOC)