diff --git a/doc/src/Developer/.gitignore b/doc/src/Developer/.gitignore new file mode 100644 index 0000000000..38f7323f7b --- /dev/null +++ b/doc/src/Developer/.gitignore @@ -0,0 +1,3 @@ +/developer.aux +/developer.log +/developer.toc diff --git a/lib/gpu/Makefile.linux b/lib/gpu/Makefile.linux index 9580bfd4ae..6b63b26398 100644 --- a/lib/gpu/Makefile.linux +++ b/lib/gpu/Makefile.linux @@ -13,13 +13,33 @@ endif NVCC = nvcc -# older CUDA -#CUDA_ARCH = -arch=sm_21 -# newer CUDA +# obsolete hardware. not supported by current drivers anymore. #CUDA_ARCH = -arch=sm_13 -# older CUDA #CUDA_ARCH = -arch=sm_10 -DCUDA_PRE_THREE -CUDA_ARCH = -arch=sm_35 + +# Fermi hardware +#CUDA_ARCH = -arch=sm_20 +#CUDA_ARCH = -arch=sm_21 + +# Kepler hardware +CUDA_ARCH = -arch=sm_30 +#CUDA_ARCH = -arch=sm_32 +#CUDA_ARCH = -arch=sm_35 +#CUDA_ARCH = -arch=sm_37 + +# Maxwell hardware +#CUDA_ARCH = -arch=sm_50 +#CUDA_ARCH = -arch=sm_52 + +# Pascal hardware +#CUDA_ARCH = -arch=sm_60 +#CUDA_ARCH = -arch=sm_61 + +# Volta hardware +#CUDA_ARCH = -arch=sm_70 + +# Turing hardware +#CUDA_ARCH = -arch=sm_75 # this setting should match LAMMPS Makefile # one of LAMMPS_SMALLBIG (default), LAMMPS_BIGBIG and LAMMPS_SMALLSMALL diff --git a/lib/gpu/Nvidia.makefile b/lib/gpu/Nvidia.makefile index 0d7214260d..233f43380f 100644 --- a/lib/gpu/Nvidia.makefile +++ b/lib/gpu/Nvidia.makefile @@ -880,7 +880,7 @@ $(OBJ_DIR)/lal_born_coul_wolf_cs_ext.o: $(ALL_H) lal_born_coul_wolf_cs.h lal_bor $(CUDR) -o $@ -c lal_born_coul_wolf_cs_ext.cpp -I$(OBJ_DIR) $(BIN_DIR)/nvc_get_devices: ./geryon/ucl_get_devices.cpp $(NVD_H) - $(CUDR) -o $@ ./geryon/ucl_get_devices.cpp -DUCL_CUDADR $(CUDA_LIB) -lcuda + $(CUDR) -o $@ ./geryon/ucl_get_devices.cpp -DUCL_CUDADR $(CUDA_LIB) -lcuda $(GPU_LIB): $(OBJS) $(CUDPP) $(AR) -crusv $(GPU_LIB) $(OBJS) $(CUDPP) diff --git a/lib/scafacos/.gitignore b/lib/scafacos/.gitignore new file mode 100644 index 0000000000..66523c0cb3 --- /dev/null +++ b/lib/scafacos/.gitignore @@ -0,0 +1,3 @@ +/scafacos* +/includelink +/liblink diff --git a/src/write_coeff.cpp b/src/write_coeff.cpp index 72b4835e55..83da6e4319 100644 --- a/src/write_coeff.cpp +++ b/src/write_coeff.cpp @@ -12,6 +12,7 @@ ------------------------------------------------------------------------- */ #include +#include #include #include "write_coeff.h" #include "pair.h"