From c22bb6340c13b760e399b46c6b5746220f7f3640 Mon Sep 17 00:00:00 2001
From: Yohai Meiron <yohai@meiron.org>
Date: Mon, 23 Aug 2021 19:45:45 -0400
Subject: [PATCH] Changed CUDAHOME to CUDA_HOME; bumped default GPUARCH to
 sm_80

---
 .gitignore   |  2 ++
 src/Makefile | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b81f43
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+src/*.o
+src/*.a
diff --git a/src/Makefile b/src/Makefile
index a65224e..bb6cd2d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 ETICS_LMAX   ?= 2
 ETICS_NMAX   ?= 10
-GPUARCH      ?= sm_75
-CUDAHOME     ?= /usr/local/cuda
+GPUARCH      ?= sm_80
+CUDA_HOME    ?= /usr/local/cuda
 OPTIMIZATION ?= 3
 
 #Optional CPPFLAGS: -DETICS_HDF5 -DETICS_BOOST -DETICS_MPI
@@ -9,27 +9,27 @@ OPTIMIZATION ?= 3
 CPPFLAGS   = -DSCF -DLMAX=$(ETICS_LMAX) -DNMAX=$(ETICS_NMAX)
 
 CXX       ?= g++
-NVCC      ?= $(CUDAHOME)/bin/nvcc
-LIB       += -lm -L$(CUDAHOME)/lib64 -lcudadevrt -lcudart -lcuda
+NVCC      ?= $(CUDA_HOME)/bin/nvcc
+LIB       += -lm -L$(CUDA_HOME)/lib64 -lcudadevrt -lcudart -lcuda
 CXXFLAGS  += -O$(OPTIMIZATION)
 CUDAFLAGS += -arch=$(GPUARCH)
 
 # If -DETICS_HDF5 is used, please specify the following
-#H5HOME   = /home/meiron/local
-#INC     += -I$(H5HOME)/include
-#LIB     += -L$(H5HOME)/lib $(H5HOME)/lib/libhdf5_hl_cpp.a $(H5HOME)/lib/libhdf5_cpp.a $(H5HOME)/lib/libhdf5_hl.a $(H5HOME)/lib/libhdf5.a -lz -ldl -lm
-#LDFLAGS += -Wl,-rpath -Wl,$(H5HOME)/lib
+#H5_HOME  = /home/meiron/local
+#INC     += -I$(H5_HOME)/include
+#LIB     += -L$(H5_HOME)/lib $(H5_HOME)/lib/libhdf5_hl_cpp.a $(H5_HOME)/lib/libhdf5_cpp.a $(H5_HOME)/lib/libhdf5_hl.a $(H5_HOME)/lib/libhdf5.a -lz -ldl -lm
+#LDFLAGS += -Wl,-rpath -Wl,$(H5_HOME)/lib
 
 # If -DETICS_BOOST is used, please specify the following
-#BOOSTHOME ?= /home/meiron/local
-#INC += -I$(BOOSTHOME)/include
+#BOOST_HOME ?= /home/meiron/local
+#INC += -I$(BOOST_HOME)/include
 
 # If -DETICS_MPI is used, please specify the following
-#MPIHOME  ?= /home/meiron/local
-#INC      += -I$(MPIHOME)/include
-#LIB      += -L$(MPIHOME)/lib -lmpi
+#MPI_HOME ?= /home/meiron/local
+#INC      += -I$(MPI_HOME)/include
+#LIB      += -L$(MPI_HOME)/lib -lmpi
 #CXXFLAGS +=  -pthread
-#LDFLAGS  += -Wl,-rpath -Wl,$(MPIHOME) -Wl,--enable-new-dtags
+#LDFLAGS  += -Wl,-rpath -Wl,$(MPI_HOME) -Wl,--enable-new-dtags
 
 CODELIB = libetics.a