Update CI

NCAR · Mar 6, 2024 · 59b73cd · 59b73cd
1 parent ba034f4
commit 59b73cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
@@ -241,19 +241,11 @@ jobs:
     # Build SCM.
     #######################################################################################
 
-    - name: Configure build with CMake (Release)
-      if: contains(matrix.build-type, 'Release')
+    - name: Configure build with CMake
       run: |
         cd ${SCM_ROOT}/scm
         mkdir bin && cd bin
-        cmake -DCCPP_SUITES=${suites} ../src -DENABLE_NVIDIA_OPENACC=${{matrix.enable-gpu-acc}}
-
-    - name: Configure build with CMake (Debug)
-      if: contains(matrix.build-type, 'Debug')
-      run: |
-        cd ${SCM_ROOT}/scm
-        mkdir bin && cd bin
-        cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug -DENABLE_NVIDIA_OPENACC=${{matrix.enable-gpu-acc}} ../src
+        cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -DENABLE_NVIDIA_OPENACC=${{matrix.enable-gpu-acc}} ../src
 
     - name: Build SCM
       run: |
@@ -267,7 +259,7 @@ jobs:
         ./contrib/get_thompson_tables.sh
 
     - name: Run SCM RTs
-      if: contains(matrix.enable-gpu-acc, 'false')
+      if: contains(matrix.enable-gpu-acc, 'False')
       run: |
         cd ${SCM_ROOT}/scm/bin
         ./run_scm.py --file /home/runner/work/ccpp-scm/ccpp-scm/test/rt_test_cases_nvidia.py --runtime_mult 0.1 -v
diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
@@ -186,7 +186,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
 
 elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "NVHPC")
-  if(DEFINED ENABLE_NVIDIA_OPENACC)
+  if(ENABLE_NVIDIA_OPENACC MATCHES "True")
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -acc -Minfo=accel")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -acc -Minfo=accel")
   else()