From cf420a9269294b44388031b31be2920666621313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Tue, 24 Sep 2024 16:00:45 +0200 Subject: [PATCH 1/2] #38: use Kokkos v4.4 in CI --- cuda11.4.3-gcc9.4-x64.dockerfile | 2 +- spack-cuda.yaml | 2 +- spack.yaml | 2 +- ubuntu20.04-gcc11-x64.dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cuda11.4.3-gcc9.4-x64.dockerfile b/cuda11.4.3-gcc9.4-x64.dockerfile index 4ab591d..91ed221 100644 --- a/cuda11.4.3-gcc9.4-x64.dockerfile +++ b/cuda11.4.3-gcc9.4-x64.dockerfile @@ -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 https://github.com/spack/spack.git && cd spack && git checkout b190518 # Add current source dir into the image COPY . /opt/src/ci-images diff --git a/spack-cuda.yaml b/spack-cuda.yaml index 85ec44b..399e54c 100644 --- a/spack-cuda.yaml +++ b/spack-cuda.yaml @@ -3,7 +3,7 @@ spack: - mpis: - mpich@3.4.2 - core-packages: - - kokkos@4.1 +cuda +wrapper +cuda_lambda cuda_arch=61 + - kokkos@4.4 +cuda +wrapper +cuda_lambda cuda_arch=61 - fmt@10.2.1 - spdlog@1.13.0 - packages: diff --git a/spack.yaml b/spack.yaml index 89ca6d9..11526fa 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,7 +4,7 @@ spack: - mpis: - mpich@3.4.2 - core-packages: - - kokkos@4.1 +openmp +serial + - kokkos@4.4 +openmp +serial - fmt@10.2.1 - spdlog@1.13.0 - packages: diff --git a/ubuntu20.04-gcc11-x64.dockerfile b/ubuntu20.04-gcc11-x64.dockerfile index cb82b51..bfc9b0e 100644 --- a/ubuntu20.04-gcc11-x64.dockerfile +++ b/ubuntu20.04-gcc11-x64.dockerfile @@ -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 https://github.com/spack/spack.git && cd spack && git checkout b190518 # Add current source dir into the image COPY . /opt/src/ci-images From b2d707f40382709a5763d12aa4b5c9de031578f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Tue, 24 Sep 2024 16:12:36 +0200 Subject: [PATCH 2/2] #38: use ArborX v1.7 in CI --- cuda11.4.3-gcc9.4-x64.dockerfile | 2 +- spack-cuda.yaml | 2 +- spack.yaml | 2 +- ubuntu20.04-gcc11-x64.dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cuda11.4.3-gcc9.4-x64.dockerfile b/cuda11.4.3-gcc9.4-x64.dockerfile index 91ed221..d5e3e41 100644 --- a/cuda11.4.3-gcc9.4-x64.dockerfile +++ b/cuda11.4.3-gcc9.4-x64.dockerfile @@ -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 https://github.com/spack/spack.git && cd spack && git checkout b190518 +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 diff --git a/spack-cuda.yaml b/spack-cuda.yaml index 399e54c..058500e 100644 --- a/spack-cuda.yaml +++ b/spack-cuda.yaml @@ -9,7 +9,7 @@ spack: - packages: - p3a@main - seacas@2024-04-03 -x11 ^hdf5@1.14.1 ^fmt@10.2.1 - - arborx@1.4.1 +openmp +mpi + - arborx@1.7 +openmp +mpi - darma-vt +kokkos +trace_enabled@develop specs: - matrix: diff --git a/spack.yaml b/spack.yaml index 11526fa..6db73d3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -10,7 +10,7 @@ spack: - packages: - p3a@main - seacas@2024-04-03 -x11 ^hdf5@1.14.1 ^fmt@10.2.1 - - arborx@1.4.1 +openmp +mpi + - arborx@1.7 +openmp +mpi - darma-vt +kokkos +trace_enabled@develop specs: - matrix: diff --git a/ubuntu20.04-gcc11-x64.dockerfile b/ubuntu20.04-gcc11-x64.dockerfile index bfc9b0e..097077d 100644 --- a/ubuntu20.04-gcc11-x64.dockerfile +++ b/ubuntu20.04-gcc11-x64.dockerfile @@ -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 https://github.com/spack/spack.git && cd spack && git checkout b190518 +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