Skip to content

Commit

Permalink
Merge pull request #74 from kokkos/73-update-ci-kokkos
Browse files Browse the repository at this point in the history
#73: update kokkos to 4.4 and add +openmp
  • Loading branch information
nmm0 authored Oct 24, 2024
2 parents 5fb5e0c + 219b495 commit 8076278
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"inherits": ["kr_auto_checkpoint_veloc", "kr_release"],
"binaryDir": "/opt/build/kokkos-resilience",
"cacheVariables": {
"Kokkos_ROOT": "/opt/view/gcc-11.4.0/kokkos/4.0.01/",
"Kokkos_ROOT": "/opt/view/gcc-11.4.0/kokkos/4.4.00/",
"Boost_ROOT": "/opt/view/gcc-11.4.0/boost/1.81.0/",
"veloc_ROOT": "/opt/veloc/",
"KR_ENABLE_TESTS": "ON",
Expand Down
2 changes: 1 addition & 1 deletion ci/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spack:
definitions:
- compilers: [[email protected]]
- packages:
- kokkos@4.0.01
- kokkos@4.4.00 +openmp
- [email protected]
specs:
- matrix:
Expand Down
2 changes: 1 addition & 1 deletion ci/ubuntu20.04-gcc11-x64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Now we install spack and find compilers/externals
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 --branch "v0.20.3" https://github.com/spack/spack.git
RUN mkdir -p /opt/ && cd /opt/ && git clone --depth 1 https://github.com/spack/spack.git && cd spack && git checkout 1b0631b69edbc99a9527c1d6b9a913a49e3b1523
ADD ./ci/packages.yaml /opt/spack/etc/spack/packages.yaml
RUN . /opt/spack/share/spack/setup-env.sh && spack compiler find
RUN . /opt/spack/share/spack/setup-env.sh && spack external find --not-buildable && spack external list
Expand Down

0 comments on commit 8076278

Please sign in to comment.