Merge pull request #1225 from akohlmey/last-minute-fixes

Last minute fixes

doc/src/Developer/.gitignore

@@ -0,0 +1,3 @@
+/developer.aux
+/developer.log
+/developer.toc

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

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)

lib/scafacos/.gitignore

@@ -0,0 +1,3 @@
+/scafacos*
+/includelink
+/liblink

src/write_coeff.cpp

@@ -12,6 +12,7 @@
 ------------------------------------------------------------------------- */
 
 #include <cstring>
+#include <cstdlib>
 #include <unistd.h>
 #include "write_coeff.h"
 #include "pair.h"