From dfda8b5ce65422dbe7eb75771c65665907c93f5d Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Wed, 22 Jan 2020 15:18:59 -0500
Subject: [PATCH] fix up LMP_FFT_LIB for reporting FFT lib in use for KOKKOS
 with CUDA logic

---
 src/KOKKOS/pppm_kokkos.h | 16 ++++++++++++++++
 src/KSPACE/pppm.h        | 10 ++--------
 src/KSPACE/pppm_disp.h   |  8 --------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/KOKKOS/pppm_kokkos.h b/src/KOKKOS/pppm_kokkos.h
index 5dd99af5fb..1f7a5c0e36 100644
--- a/src/KOKKOS/pppm_kokkos.h
+++ b/src/KOKKOS/pppm_kokkos.h
@@ -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"
diff --git a/src/KSPACE/pppm.h b/src/KSPACE/pppm.h
index de9c1cc5e4..f73fb49ad3 100644
--- a/src/KSPACE/pppm.h
+++ b/src/KSPACE/pppm.h
@@ -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
diff --git a/src/KSPACE/pppm_disp.h b/src/KSPACE/pppm_disp.h
index 9b34200547..130671fa28 100644
--- a/src/KSPACE/pppm_disp.h
+++ b/src/KSPACE/pppm_disp.h
@@ -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"