Skip to content

Commit

Permalink
Merge pull request sandialabs#39 from NexGenAnalytics/38-kokkos-4.4
Browse files Browse the repository at this point in the history
sandialabs#38: use Kokkos v4.4 in CI
  • Loading branch information
nmm0 authored Sep 24, 2024
2 parents 9c9f856 + b2d707f commit a0c3675
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cuda11.4.3-gcc9.4-x64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN apt update \
RUN pip install clingo

# Now we install spack and find compilers/externals
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.22.0" https://github.com/spack/spack.git
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "develop-2024-09-22" https://github.com/spack/spack.git

# Add current source dir into the image
COPY . /opt/src/ci-images
Expand Down
4 changes: 2 additions & 2 deletions spack-cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ spack:
- mpis:
- [email protected]
- core-packages:
- kokkos@4.1 +cuda +wrapper +cuda_lambda cuda_arch=61
- kokkos@4.4 +cuda +wrapper +cuda_lambda cuda_arch=61
- [email protected]
- [email protected]
- packages:
- p3a@main
- seacas@2024-04-03 -x11 ^[email protected] ^[email protected]
- arborx@1.4.1 +openmp +mpi
- arborx@1.7 +openmp +mpi
- darma-vt +kokkos +trace_enabled@develop
specs:
- matrix:
Expand Down
4 changes: 2 additions & 2 deletions spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ spack:
- mpis:
- [email protected]
- core-packages:
- kokkos@4.1 +openmp +serial
- kokkos@4.4 +openmp +serial
- [email protected]
- [email protected]
- packages:
- p3a@main
- seacas@2024-04-03 -x11 ^[email protected] ^[email protected]
- arborx@1.4.1 +openmp +mpi
- arborx@1.7 +openmp +mpi
- darma-vt +kokkos +trace_enabled@develop
specs:
- matrix:
Expand Down
2 changes: 1 addition & 1 deletion ubuntu20.04-gcc11-x64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN apt-get update \
RUN pip install clingo

# Now we install spack and find compilers/externals
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.22.0" https://github.com/spack/spack.git
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "develop-2024-09-22" https://github.com/spack/spack.git

# Add current source dir into the image
COPY . /opt/src/ci-images
Expand Down

0 comments on commit a0c3675

Please sign in to comment.