From 53c55451b3984703e74c6dddb9977c918af39b28 Mon Sep 17 00:00:00 2001 From: ianchb Date: Sat, 25 Apr 2026 09:19:50 +0800 Subject: [PATCH] Update makefile and scripts for CUDA BSSN configuration and build commands --- AMSS_NCKU_source/makefile | 13 +++++++------ makefile_and_run.py | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AMSS_NCKU_source/makefile b/AMSS_NCKU_source/makefile index 6541f72..397b8ce 100644 --- a/AMSS_NCKU_source/makefile +++ b/AMSS_NCKU_source/makefile @@ -85,10 +85,10 @@ TwoPunctureABE.o: TwoPunctureABE.C # Input files -## CUDA BSSN RHS switch -## 1 : use the rewritten CUDA bssn_rhs backend -## 0 : keep the normal CPU/Fortran selection below -USE_CUDA_BSSN ?= 1 +## CUDA BSSN RHS switch +## 1 : use the rewritten CUDA bssn_rhs backend +## 0 : keep the normal CPU/Fortran selection below +USE_CUDA_BSSN ?= 0 CXXAPPFLAGS += -DUSE_CUDA_BSSN=$(USE_CUDA_BSSN) CUDA_APP_FLAGS += -DUSE_CUDA_BSSN=$(USE_CUDA_BSSN) @@ -210,8 +210,9 @@ misc.o : zbesh.o ABE: $(C++FILES) $(CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(CLINKER) $(CXXAPPFLAGS) -o $@ $(C++FILES) $(CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(ABE_LDLIBS) -ABE_CUDA: $(C++FILES) $(ABE_CUDA_CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) - $(CLINKER) $(CXXAPPFLAGS) -o $@ $(C++FILES) $(ABE_CUDA_CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(LDLIBS) -lcudart $(CUDA_LIB_PATH) +ABE_CUDA: USE_CUDA_BSSN=1 +ABE_CUDA: $(C++FILES) $(ABE_CUDA_CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) + $(CLINKER) $(CXXAPPFLAGS) -o $@ $(C++FILES) $(ABE_CUDA_CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(LDLIBS) -lcudart $(CUDA_LIB_PATH) #ABEGPU: $(C++FILES_GPU) $(CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(CUDAFILES) # $(CLINKER) $(CXXAPPFLAGS) -o $@ $(C++FILES_GPU) $(CFILES) $(F90FILES) $(F77FILES) $(AHFDOBJS) $(CUDAFILES) $(LDLIBS) diff --git a/makefile_and_run.py b/makefile_and_run.py index 5d403a6..3419a05 100755 --- a/makefile_and_run.py +++ b/makefile_and_run.py @@ -70,9 +70,9 @@ def makefile_ABE(): ## Build command with CPU binding to nohz_full cores if (input_data.GPU_Calculation == "no"): - makefile_command = f"{NUMACTL_CPU_BIND} make -j{BUILD_JOBS} INTERP_LB_MODE=off ABE" + makefile_command = f"{NUMACTL_CPU_BIND} make -j{BUILD_JOBS} INTERP_LB_MODE=off USE_CUDA_BSSN=0 ABE" elif (input_data.GPU_Calculation == "yes"): - makefile_command = f"{NUMACTL_CPU_BIND} make -j{BUILD_JOBS} INTERP_LB_MODE=off ABE_CUDA" + makefile_command = f"{NUMACTL_CPU_BIND} make -j{BUILD_JOBS} INTERP_LB_MODE=off USE_CUDA_BSSN=1 ABE_CUDA" else: print( " CPU/GPU numerical calculation setting is wrong " ) print( )