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

cleanup

Browse Source
This commit is contained in:
Chris Knight
2024-08-29 18:20:41 +00:00
parent af560356fe
commit f0513bad4c
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MAKE/MACHINES/Makefile.aurora
View File

@ -116,6 +116,6 @@ depend : fastdep.exe $(SRC)
@./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1 @./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1
fastdep.exe: ../DEPEND/fastdep.c fastdep.exe: ../DEPEND/fastdep.c
cc -O -o $@ $< icx -O -o $@ $<
sinclude .depend sinclude .depend

10
src/MAKE/MACHINES/Makefile.aurora_kokkos
View File

@ -7,7 +7,7 @@ SHELL = /bin/sh
# specify flags and libraries needed for your compiler # specify flags and libraries needed for your compiler
CC = mpicxx CC = mpicxx
CCFLAGS = -g -O3 -DNDEBUG CCFLAGS = -g -O3 -DNDEBUG -w
CCFLAGS += -fsycl-device-code-split=per_kernel CCFLAGS += -fsycl-device-code-split=per_kernel
SHFLAGS = -fPIC SHFLAGS = -fPIC
DEPFLAGS = -M DEPFLAGS = -M
@ -54,9 +54,9 @@ MPI_LIB =
# PATH = path for FFT library # PATH = path for FFT library
# LIB = name of FFT library # LIB = name of FFT library
FFT_INC = FFT_INC = -DFFT_KOKKOS_MKL_GPU -I${MKL_ROOT}/include
FFT_PATH = FFT_PATH = -L${MKL_ROOT}/lib -L${TBB_ROOT}/lib/intel64/gcc4.8
FFT_LIB = FFT_LIB = -lmkl_sycl_dft -lmkl_intel_ilp64 -lmkl_tbb_thread -lmkl_core -ltbb
# JPEG and/or PNG library # JPEG and/or PNG library
# see discussion in Section 3.5.4 of manual # see discussion in Section 3.5.4 of manual
@ -118,6 +118,6 @@ depend : fastdep.exe $(SRC)
@./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1 @./fastdep.exe $(EXTRA_INC) -- $^ > .depend || exit 1
fastdep.exe: ../DEPEND/fastdep.c fastdep.exe: ../DEPEND/fastdep.c
cc -O -o $@ $< icx -O -o $@ $<
sinclude .depend sinclude .depend

4
src/info.cpp
View File

@ -1316,6 +1316,8 @@ std::string Info::get_fft_info()
#else #else
fft_info += "FFT library = MKL\n"; fft_info += "FFT library = MKL\n";
#endif #endif
#elif defined(FFT_MKL_GPU)
fft_info += "FFT library = MKL GPU\n";
#elif defined(FFT_FFTW3) #elif defined(FFT_FFTW3)
#if defined(FFT_FFTW_THREADS) #if defined(FFT_FFTW_THREADS)
fft_info += "FFT library = FFTW3 with threads\n"; fft_info += "FFT library = FFTW3 with threads\n";
@ -1344,6 +1346,8 @@ std::string Info::get_fft_info()
#else #else
fft_info += "KOKKOS FFT library = MKL\n"; fft_info += "KOKKOS FFT library = MKL\n";
#endif #endif
#elif defined(FFT_KOKKOS_MKL_GPU)
fft_info += "KOKKOS FFT library = MKL GPU\n";
#else #else
fft_info += "KOKKOS FFT library = KISS\n"; fft_info += "KOKKOS FFT library = KISS\n";
#endif #endif

2
src/lmpfftsettings.h
View File

@ -39,6 +39,8 @@
#define LMP_FFT_LIB "FFTW3" #define LMP_FFT_LIB "FFTW3"
#elif defined(FFT_MKL) #elif defined(FFT_MKL)
#define LMP_FFT_LIB "MKL FFT" #define LMP_FFT_LIB "MKL FFT"
#elif defined(FFT_MKL_GPU)
#define LMP_FFT_LIB "MKL GPU FFT"
#elif defined(FFT_CUFFT) #elif defined(FFT_CUFFT)
#define LMP_FFT_LIB "cuFFT" #define LMP_FFT_LIB "cuFFT"
#elif defined(FFT_HIPFFT) #elif defined(FFT_HIPFFT)