Fix name issue

lab-cosmo · Feb 6, 2024 · c1024c8 · c1024c8
1 parent 2f4dbdc
commit c1024c8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/KOKKOS/fft3d_kokkos.cpp b/src/KOKKOS/fft3d_kokkos.cpp
@@ -58,7 +58,7 @@ FFT3dKokkos<DeviceType>::FFT3dKokkos(LAMMPS *lmp, MPI_Comm comm, int nfast, int
   if (ngpus > 0 && execution_space == Host)
     lmp->error->all(FLERR,"Cannot use the hipFFT library with Kokkos on the host CPUs");
 
-#elif defined(FFT_KOKKOS_KISSFFT)
+#elif defined(FFT_KOKKOS_KISS)
   // The compiler can't statically determine the stack size needed for
   //  recursive function calls in KISS FFT and the default per-thread
   //  stack size on GPUs needs to be increased to prevent stack overflows
@@ -163,7 +163,7 @@ struct norm_functor {
   }
 };
 
-#ifdef FFT_KOKKOS_KISSFFT
+#ifdef FFT_KOKKOS_KISS
 template<class DeviceType>
 struct kiss_fft_functor {
 public:
@@ -797,7 +797,7 @@ void FFT3dKokkos<DeviceType>::fft_3d_destroy_plan_kokkos(struct fft_plan_3d_kokk
   FFTW_API(cleanup_threads)();
 #endif
 
-#elif defined (FFT_KOKKOS_KISSFFT)
+#elif defined (FFT_KOKKOS_KISS)
   delete kissfftKK;
 #endif
 

diff --git a/src/KOKKOS/fft3d_kokkos.h b/src/KOKKOS/fft3d_kokkos.h
@@ -92,7 +92,7 @@ class FFT3dKokkos : protected Pointers {
   struct fft_plan_3d_kokkos<DeviceType> *plan;
   RemapKokkos<DeviceType> *remapKK;
 
-#ifdef FFT_KOKKOS_KISSFFT
+#ifdef FFT_KOKKOS_KISS
   KissFFTKokkos<DeviceType> *kissfftKK;
 #endif
 

diff --git a/src/KOKKOS/fftdata_kokkos.h b/src/KOKKOS/fftdata_kokkos.h
@@ -77,8 +77,8 @@
     kiss_fft_scalar re;
     kiss_fft_scalar im;
   } FFT_KOKKOS_DATA;
-  #ifndef FFT_KOKKOS_KISSFFT
-  #define FFT_KOKKOS_KISSFFT
+  #ifndef FFT_KOKKOS_KISS
+  #define FFT_KOKKOS_KISS
   #endif
 #endif
 
@@ -159,7 +159,7 @@ typedef struct FFTArrayTypes<LMPDeviceType> FFT_DAT;
 typedef struct FFTArrayTypes<LMPHostType> FFT_HAT;
 
 
-#if defined(FFT_KOKKOS_KISSFFT)
+#if defined(FFT_KOKKOS_KISS)
 #include "kissfft_kokkos.h" // uses t_FFT_DATA_1d, needs to come last
 #endif
 

diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp
@@ -108,7 +108,7 @@ PPPMKokkos<DeviceType>::PPPMKokkos(LAMMPS *lmp) : PPPM(lmp)
   remap = nullptr;
 
 #if defined (LMP_KOKKOS_GPU)
-  #if defined(FFT_KOKKOS_KISSFFT)
+  #if defined(FFT_KOKKOS_KISS)
     if (comm->me == 0)
       error->warning(FLERR,"Using default KISS FFT with Kokkos GPU backends may give suboptimal performance");
   #endif

diff --git a/src/lmpfftsettings.h b/src/lmpfftsettings.h
@@ -62,7 +62,7 @@
 #ifdef LMP_KOKKOS
 
 // with KOKKOS in CUDA or HIP mode we can only have
-//  CUFFT/HIPFFT or KISSFFT, thus undefine all other
+//  CUFFT/HIPFFT or KISS, thus undefine all other
 //  FFTs here
 
 #ifdef KOKKOS_ENABLE_CUDA
@@ -75,8 +75,8 @@
 # if defined(FFT_KOKKOS_MKL)
 #  undef FFT_KOKKOS_MKL
 # endif
-# if !defined(FFT_KOKKOS_CUFFT) && !defined(FFT_KOKKOS_KISSFFT)
-#  define FFT_KOKKOS_KISSFFT
+# if !defined(FFT_KOKKOS_CUFFT) && !defined(FFT_KOKKOS_KISS)
+#  define FFT_KOKKOS_KISS
 # endif
 #elif defined(KOKKOS_ENABLE_HIP)
 # if defined(FFT_KOKKOS_FFTW)
@@ -88,8 +88,8 @@
 # if defined(FFT_KOKKOS_MKL)
 #  undef FFT_KOKKOS_MKL
 # endif
-# if !defined(FFT_KOKKOS_HIPFFT) && !defined(FFT_KOKKOS_KISSFFT)
-#  define FFT_KOKKOS_KISSFFT
+# if !defined(FFT_KOKKOS_HIPFFT) && !defined(FFT_KOKKOS_KISS)
+#  define FFT_KOKKOS_KISS
 # endif
 #else
 # if defined(FFT_KOKKOS_CUFFT)