Skip to content

Commit

Permalink
Fix cache dependency bug
Browse files Browse the repository at this point in the history
  • Loading branch information
gartavanis committed Dec 11, 2024
1 parent a67e839 commit c253681
Showing 1 changed file with 43 additions and 13 deletions.
56 changes: 43 additions & 13 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ jobs:
python: "false",
backend: "none",
amps_layer: mpi1,
netcdf: "true"
netcdf: "true",
memory_manager: "none"
}
- {
name: "Ubuntu 24.04 LLVM",
Expand All @@ -118,7 +119,8 @@ jobs:
python: "false",
backend: "none",
amps_layer: mpi1,
netcdf: "true"
netcdf: "true",
memory_manager: "none"
}
- {
name: "Ubuntu 22.04 GCC Python",
Expand All @@ -128,7 +130,8 @@ jobs:
python: "true",
backend: "none",
amps_layer: mpi1,
netcdf: "true"
netcdf: "true",
memory_manager: "none"
}
- {
name: "Ubuntu 20.04 GCC Python",
Expand All @@ -138,7 +141,8 @@ jobs:
python: "true",
backend: "none",
amps_layer: mpi1,
netcdf: "false"
netcdf: "false",
memory_manager: "none"
}
- {
name: "Ubuntu 22.04 GCC OMP",
Expand All @@ -148,7 +152,8 @@ jobs:
python: "false",
backend: "omp",
amps_layer: mpi1,
netcdf: "false"
netcdf: "false",
memory_manager: "none"
}
- {
name: "Ubuntu 24.04 LLVM OASIS3-MCT Build",
Expand All @@ -158,27 +163,52 @@ jobs:
python: "false",
backend: "omp",
amps_layer: oas3,
netcdf: "true"
netcdf: "true",
memory_manager: "none"
}
- {
name: "Ubuntu 22.04 GCC CUDA Build",
name: "Ubuntu 22.04 GCC CUDA/RMM Build",
os: ubuntu-22.04,
cc: "gcc", cxx: "g++", fc: "gfortran",
python: "false",
backend: "cuda",
cudaos: 'ubuntu2204',
amps_layer: mpi1,
netcdf: "false"
netcdf: "false",
memory_manager: "rmm"
}
- {
name: "Ubuntu 22.04 GCC Kokkos Build",
name: "Ubuntu 22.04 GCC CUDA/Umpire Build",
os: ubuntu-22.04,
cc: "gcc", cxx: "g++", fc: "gfortran",
python: "false",
backend: "cuda",
cudaos: 'ubuntu2204',
amps_layer: mpi1,
netcdf: "false",
memory_manager: "umpire"
}
- {
name: "Ubuntu 22.04 GCC Kokkos/RMM Build",
os: ubuntu-22.04,
cc: "gcc", cxx: "g++", fc: "gfortran",
python: "false",
backend: "kokkos",
cudaos: 'ubuntu2204',
amps_layer: mpi1,
netcdf: "false",
memory_manager: "rmm"
}
- {
name: "Ubuntu 22.04 GCC Kokkos/Umpire Build",
os: ubuntu-22.04,
cc: "gcc", cxx: "g++", fc: "gfortran",
python: "false",
backend: "kokkos",
cudaos: 'ubuntu2204',
amps_layer: mpi1,
netcdf: "false"
netcdf: "false",
memory_manager: "umpire"
}

steps:
Expand Down Expand Up @@ -227,7 +257,7 @@ jobs:
cache-parflow-hit: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
with:
path: "~/depend"
key: cache-${{ matrix.config.os }}-${{ matrix.config.backend }}-${{ secrets.CACHE_VERSION }}
key: cache-${{ matrix.config.os }}-${{ matrix.config.backend }}-${{ matrix.config.memory_manager }}-${{ secrets.CACHE_VERSION }}

- name: Directory Setup
run: |
Expand Down Expand Up @@ -319,7 +349,7 @@ jobs:
- name: RMM Install
env:
CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
if: matrix.config.backend == 'cuda' || matrix.config.backend == 'kokkos'
if: (matrix.config.backend == 'cuda' || matrix.config.backend == 'kokkos') && matrix.config.memory_manager == 'rmm'
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
git clone -b branch-0.10 --single-branch --recurse-submodules https://github.com/rapidsai/rmm.git
Expand All @@ -332,7 +362,7 @@ jobs:
- name: Umpire Install
env:
CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
if: matrix.config.backend == 'cuda' || matrix.config.backend == 'kokkos'
if: (matrix.config.backend == 'cuda' || matrix.config.backend == 'kokkos') && matrix.config.memory_manager == 'umpire'
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
git clone --recursive https://github.com/LLNL/Umpire.git
Expand Down

0 comments on commit c253681

Please sign in to comment.