Adding more unique cache names and fixing nvidia build

NCAR · Feb 20, 2025 · 38c4c5e · 38c4c5e
1 parent 2ffffdc
commit 38c4c5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu.yml b/.github/workflows/ci_build_scm_ubuntu.yml
@@ -73,7 +73,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /home/runner/bacio
-        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
+        key: cache-bacio-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-${{matrix.py-version}}-key
 
     - name: Install bacio library v2.4.1
       if: steps.cache-bacio-fortran.outputs.cache-hit != 'true'
@@ -90,7 +90,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /home/runner/NCEPLIBS-sp
-        key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
+        key: cache-sp-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-${{matrix.py-version}}-key
 
     - name: Install SP-library v2.3.3
       if: steps.cache-sp-fortran.outputs.cache-hit != 'true'
@@ -107,7 +107,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /home/runner/myw3emc
-        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
+        key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-${{matrix.py-version}}-key
 
     - name: Install w3emc library v2.9.2
       if: steps.cache-w3emc-fortran.outputs.cache-hit != 'true'
@@ -129,7 +129,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /home/runner/netcdf-fortran
-        key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
+        key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-${{matrix.build-type}}-${{matrix.py-version}}-key
 
     - name: Install NetCDF Fortran library
       if: steps.cache-netcdf-fortran.outputs.cache-hit != 'true'

diff --git a/.github/workflows/ci_build_scm_ubuntu_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_nvidia.yml
@@ -1,4 +1,4 @@
-name: build the CCPP-SCM on latest Ubuntu runner
+name: build the CCPP-SCM with Nvidia
 
 on: [pull_request,workflow_dispatch]
 
@@ -91,9 +91,9 @@ jobs:
         NVCOMPILERS: /home/runner/hpc_sdk
         NVARCH: Linux_x86_64
         NVYEAR: 2025
-        NVVERSION: "25.1"
+        NVVERSION: 25.1
         CUDA_VERSION: 12.6
-        NVVERSION_PACKED: ${{ replace(env.NVVERSION, '.', '') }}
+        NVVERSION_PACKED: 251 # Manually take NVVERSION and remove . because funcationality not in actions
         NVHPC_SILENT: true
         NVHPC_INSTALL_DIR: /home/runner/hpc_sdk
         NVHPC_INSTALL_TYPE: network
@@ -102,7 +102,8 @@ jobs:
         mkdir /home/runner/hpc_sdk && cd /home/runner/hpc_sdk
         wget -q https://developer.download.nvidia.com/hpc-sdk/${NVVERSION}/nvhpc_${NVYEAR}_${NVVERSION_PACKED}_Linux_x86_64_cuda_${CUDA_VERSION}.tar.gz
         tar xpzf nvhpc_${NVYEAR}_${NVVERSION_PACKED}_Linux_x86_64_cuda_${CUDA_VERSION}.tar.gz
-        nvhpc_${NVYEAR}_${NVVERSION_PACKED}_Linux_x86_64_cuda_${CUDA_VERSION}.tar.gz/install
+        ls
+        nvhpc_${NVYEAR}_${NVVERSION_PACKED}_Linux_x86_64_cuda_${CUDA_VERSION}/install
         export PATH=${PATH}:${NVCOMPILERS}/${NVARCH}/${NVVERSION}/compilers/bin
         export MANPATH=${MANPATH}:${NVCOMPILERS}/${NVARCH}/${NVVERSION}/compilers/man
         echo "The nvfortran installed is:"