Unverified Commit dfda8b5c authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

fix up LMP_FFT_LIB for reporting FFT lib in use for KOKKOS with CUDA logic

parent 2d28e9fa
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -22,6 +22,22 @@ KSpaceStyle(pppm/kk/host,PPPMKokkos<LMPHostType>)
#ifndef LMP_PPPM_KOKKOS_H
#define LMP_PPPM_KOKKOS_H

// fix up FFT defines for KOKKOS with CUDA

#if defined(KOKKOS_ENABLE_CUDA)
# if defined(FFT_FFTW)
#  undef FFT_FFTW
# endif
# if defined(FFT_FFTW3)
#  undef FFT_FFTW3
# endif
# if defined(FFT_MKL)
#  undef FFT_MKL
# endif
# if !defined(FFT_CUFFT) && !defined(FFT_KISSFFT)
#  define FFT_KISSFFT
# endif

#include "pppm.h"
#include "gridcomm_kokkos.h"
#include "remap_kokkos.h"
+2 −8
Original line number Diff line number Diff line
@@ -26,14 +26,8 @@ KSpaceStyle(pppm,PPPM)
#define LMP_FFT_LIB "FFTW3"
#elif defined(FFT_MKL)
#define LMP_FFT_LIB "MKL FFT"
#else
#define LMP_FFT_LIB "KISS FFT"
#endif

#if defined(FFT_FFTW3)
#define LMP_FFT_LIB "FFTW3"
#elif defined(FFT_MKL)
#define LMP_FFT_LIB "MKL FFT"
#elif defined(FFT_CUFFT)
#define LMP_FFT_LIB "cuFFT"
#else
#define LMP_FFT_LIB "KISS FFT"
#endif
+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ KSpaceStyle(pppm/disp,PPPMDisp)
#define LMP_FFT_LIB "KISS FFT"
#endif

#if defined(FFT_FFTW3)
#define LMP_FFT_LIB "FFTW3"
#elif defined(FFT_MKL)
#define LMP_FFT_LIB "MKL FFT"
#else
#define LMP_FFT_LIB "KISS FFT"
#endif

#ifdef FFT_SINGLE
typedef float FFT_SCALAR;
#define LMP_FFT_PREC "single"