Merge pull request #2 from earth-system-radiation/feature-add-ci

Add preliminary CI. Changes in the `rte-rrtmgp` repo should get aligned with here: adopting CMake and C_BOOL by default.

.github/workflows/gitlab-ci.yml

@@ -3,10 +3,7 @@ on:
   push:
     branches:
     - main
-    - feature-add-ci
   pull_request:
-    branches-ignore:
-    - documentation
   workflow_dispatch:
 
 defaults:
@@ -68,6 +65,7 @@ jobs:
       matrix:
         config-name:
           - nvhpc-gpu-cuda-DP
+          - nvhpc-gpu-cuda-SP
     steps:
     #
     # Build, run and check (fetch the log)

.gitlab/common.yml

@@ -21,4 +21,5 @@
     #
     # Build libraries
     #
+    - git branch
     - make libs

.gitlab/levante.yml

@@ -24,12 +24,9 @@ variables:
 .nvhpc:
   variables:
     # Core variables:
-    FC: /sw/spack-levante/nvhpc-22.5-v4oky3/Linux_x86_64/22.5/compilers/bin/nvfortran
-    CPPC: /sw/spack-levante/nvhpc-22.5-v4oky3/Linux_x86_64/22.5/compilers/bin/nvc++
-    # Convenience variables:
-    VERSION_FCFLAGS: --version
-    NFHOME: /sw/spack-levante/netcdf-fortran-4.5.4-syv4qr
-    NCHOME: /sw/spack-levante/netcdf-c-4.9.0-gc7kgj
+    CUDACXX: nvcc
+    # Flags used in building Icon 
+    CUDAFLAGS: -Xptxas -O3 -DNDEBUG -DRTE_RRTMGP_GPU_MEMPOOL_CUDA
 
 .common-levante:
   extends: .common
@@ -38,11 +35,10 @@ variables:
     # Suppress an irrelevant but annoying error message:
     PROJ_LIB: ${PYHOME}/share/proj
     # Make variables:
-    FCINCLUDE: -I${NFHOME}/include
-    LDFLAGS: -L${NFHOME}/lib -L${NCHOME}/lib
   before_script:
     - module purge
     - module load git
+    - module load nvhpc/24.7-gcc-11.2.0
     # Extend the existing environment variables:
     - export PATH="${PYHOME}/bin:${PATH}"
     - export LD_LIBRARY_PATH="${NFHOME}/lib:${NCHOME}/lib:${LD_LIBRARY_PATH-}"
@@ -54,12 +50,13 @@ variables:
     - .gpu
     - .nvhpc
     - .common-levante
-  variables:
-    # Compiler flags used for ICON model:
-    FCFLAGS: -g -O2 -Mrecursive -Mallocatable=03 -Mstack_arrays -Minfo=accel,inline -acc=gpu,verystrict -gpu=cc80,cuda11.7 -DRTE_USE_${FPMODEL}
-    RTE_KERNELS: accel
 
 nvhpc-gpu-cuda-DP: 
   extends:
     - .dp
     - .nvhpc-gpu-openacc
+
+nvhpc-gpu-cuda-SP: 
+  extends:
+    - .sp
+    - .nvhpc-gpu-openacc

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 ?= "-Xptxas -O3 -DNDEBUG -DRTE_RRTMGP_GPU_MEMPOOL_CUDA"
+COMPILE_CU = $(CUDACXX) -c $(CUDAFLAGS)
 
-COMPILE_CU = $(CPPC) -c -std=c++17 -O3 -gopt -DRTE_RRTMGP_GPU_MEMPOOL_CUDA -acc -cuda
 
 %.o: %.cu
 	$(COMPILE_CU) $<