ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant checks

Browse Source
This commit is contained in:
Stan Gerald Moore
2024-02-06 13:28:33 -07:00
parent 19a5de1be6
commit 2f4dbdceb6
2 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/lmpfftsettings.h
View File

@ -26,12 +26,15 @@
#endif
#ifdef LMP_KOKKOS
#ifdef FFT_KOKKOS_FFTW
#ifndef FFT_KOKKOS_FFTW3
#undef FFT_KOKKOS_FFTW
#define FFT_KOKKOS_FFTW3
#endif
#endif
# ifdef FFT_KOKKOS_FFTW
# undef FFT_KOKKOS_FFTW
# define FFT_KOKKOS_FFTW3
# endif
# ifdef FFT_KOKKOS_FFTW_THREADS
# if !defined(FFT_KOKKOS_FFTW3)
# error "Must use -DFFT_KOKKOS_FFTW3 with -DFFT_KOKKOS_FFTW_THREADS"
# endif
# endif
#endif
// set strings for library info output
@ -58,7 +61,9 @@
#ifdef LMP_KOKKOS
// fix up FFT defines for KOKKOS with CUDA and HIP
// with KOKKOS in CUDA or HIP mode we can only have
// CUFFT/HIPFFT or KISSFFT, thus undefine all other
// FFTs here
#ifdef KOKKOS_ENABLE_CUDA
# if defined(FFT_KOKKOS_FFTW)
@ -86,6 +91,13 @@
# if !defined(FFT_KOKKOS_HIPFFT) && !defined(FFT_KOKKOS_KISSFFT)
# define FFT_KOKKOS_KISSFFT
# endif
#else
# if defined(FFT_KOKKOS_CUFFT)
# error "Must enable CUDA with KOKKOS to use -DFFT_KOKKOS_CUFFT"
# endif
# if defined(FFT_KOKKOS_HIPFFT)
# error "Must enable HIP with KOKKOS to use -DFFT_KOKKOS_HIPFFT"
# endif
#endif
#if defined(FFT_KOKKOS_CUFFT)