updating some makefile options

starkiller-astro · Jan 10, 2024 · 4555eca · 4555eca
1 parent 69b9e25
commit 4555eca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/source/Makefile b/source/Makefile
@@ -10,6 +10,7 @@ VPATH = .
 
 ## Define XNet's source directory
 XNET_DIR = .
+XNET_TEST_DIR = $(XNET_TEST_DIR)
 
 ## Include options for build configurations defined in Makefile.opt
 include $(XNET_DIR)/Makefile.opt
@@ -86,22 +87,22 @@ all: xnet_dense net_setup xnse
 test: test_serial test_heat test_setup test_nse
 
 test_serial: $(EXE)
-	@cd ../test ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 0
+	@cd $(XNET_TEST_DIR) ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 0
 
 test_heat: $(EXE)
-	@cd ../test ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 50
+	@cd $(XNET_TEST_DIR) ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 50
 
 test_simple: $(EXE)
-	@cd ../test ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 51
+	@cd $(XNET_TEST_DIR) ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 51
 
 test_batch: $(EXE)
-	@cd ../test ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 62
+	@cd $(XNET_TEST_DIR) ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnet 62
 
 test_setup: net_setup
-	@cd ../test/Data_SN160 ; ../../source/net_setup <<< "net_setup test"
+	@cd $(XNET_TEST_DIR)/Data_SN160 ; ../../source/net_setup <<< "net_setup test"
 
 test_nse: xnse
-	@cd ../test ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnse 81
+	@cd $(XNET_TEST_DIR) ; ln -sf ../tools/starkiller-helmholtz/helm_table.dat . ; ./test_xnet.sh ../source/xnse 81
 
 #
 # Rules to build specific configurations of XNet and supporting tools

diff --git a/source/Makefile.dev b/source/Makefile.dev
@@ -123,6 +123,9 @@ endif
 ifneq ($(findstring sm70, $(GPU_TARGET)),)
     NVCCFLAGS += -gencode arch=compute_70,code=sm_70
 endif
+ifneq ($(findstring sm70, $(GPU_TARGET)),)
+    NVCCFLAGS += -gencode arch=compute_80,code=sm_80
+endif
 
 ## Flags for compiling with OpenACC
 ifeq ($(GPU_MODE),ON)

diff --git a/source/Makefile.internal b/source/Makefile.internal
@@ -175,7 +175,7 @@ else ifeq ($(PE_ENV),NVIDIA)
     ifeq ($(OPENMP_MODE),ON)
         OPENMP    = -mp=multicore
     else
-        OPENMP    = -mp=multicore -Mnoopenmp
+        OPENMP    =# -mp=multicore -Mnoopenmp
     endif
     ifeq ($(OPENACC_MODE),ON)
         OPENACC   = -acc -gpu=ptxinfo -Minfo=accel

diff --git a/source/Makefile.opt b/source/Makefile.opt
@@ -62,4 +62,5 @@ MATRIX_SOLVER ?= dense
 ##    Maxwell - NVIDIA compute capability 5.x cards
 ##    Pascal  - NVIDIA compute capability 6.x cards
 ##    Volta   - NVIDIA compute capability 7.x cards
+##    Ampere  - NVIDIA compute capability 8.x cards
 GPU_TARGET ?= Volta