Skip to content

Commit

Permalink
Merge pull request #17 from sandialabs/ci-upgrade-kokkos
Browse files Browse the repository at this point in the history
[CI] use kokkos `4.1.0`
  • Loading branch information
nmm0 authored Feb 12, 2024
2 parents ee35efb + e9dc8fc commit 022980c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
12 changes: 0 additions & 12 deletions arborx_spack_package.patch

This file was deleted.

2 changes: 1 addition & 1 deletion spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ spack:
- mpis:
- [email protected]
- core-packages:
- kokkos@4.0 +openmp +serial
- kokkos@4.1 +openmp +serial
- packages:
- p3a@main
- seacas@2022-10-14 -x11 ^[email protected] ^[email protected]
Expand Down
5 changes: 1 addition & 4 deletions ubuntu20.04-gcc11-x64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,14 @@ 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.20.1" https://github.com/spack/spack.git
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.21.1" https://github.com/spack/spack.git

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

# Get the latest version of the darma-vt repo
RUN cd /opt/src/ci-images/spack-repos && git clone https://github.com/DARMA-tasking/spack-package.git vt

# Apply our patch to get more up-to-date packages
RUN cd /opt/spack && git apply /opt/src/ci-images/arborx_spack_package.patch

# Add our new repos
RUN . /opt/spack/share/spack/setup-env.sh \
&& spack repo add /opt/src/ci-images/spack-repos/p3a \
Expand Down

0 comments on commit 022980c

Please sign in to comment.