jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Axel Kohlmeyer 2020-01-22 15:18:59 -05:00
parent 2d28e9fa2e
commit dfda8b5ce6
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/KOKKOS/pppm_kokkos.h
View File

@ -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"

10
src/KSPACE/pppm.h
View File

@ -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

8
src/KSPACE/pppm_disp.h
View File

@ -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"