Update CUDA flags, remove unneeded Fortran

earth-system-radiation · Nov 8, 2024 · cc66fca · cc66fca
1 parent e8edd92
commit cc66fca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.gitlab/levante.yml b/.gitlab/levante.yml
@@ -26,6 +26,8 @@ variables:
     # Core variables:
     FC: nvfortran
     CUDACXX: nvcc
+    # Flags used in building Icon 
+    CUDAFLAGS: -arch=sm_80 -g -O3 -expt-relaxed-constexpr -DNDEBUG
     # Convenience variables:
     VERSION_FCFLAGS: --version
     NFHOME: /sw/spack-levante/netcdf-fortran-4.5.4-syv4qr

diff --git a/build/Makefile b/build/Makefile
@@ -1,16 +1,9 @@
 #!/usr/bin/env make
-
-#
-# Compiler variables FC, FCFLAGS must be set in the environment
-#
-# Make all the libraries though we'll only use the interface + kernels
 all:           librtecudakernels.a librrtmgpcudakernels.a
 
-COMPILE = $(FC) $(FCFLAGS) $(FCINCLUDE) -c
-%.o: %.F90
-	$(COMPILE) $<
+CUDAFLAGS ?= "-O3 -gopt -DRTE_RRTMGP_GPU_MEMPOOL_CUDA -acc -cuda"
+COMPILE_CU = $(CUDACXX) -c $(CUDAFLAGS)
 
-COMPILE_CU = $(CUDACXX) -c -O3 -gopt -DRTE_RRTMGP_GPU_MEMPOOL_CUDA -acc -cuda
 
 %.o: %.cu
 	$(COMPILE_CU) $<