From b584efe818dbc2810157491ce276b296e65db246 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 13 Apr 2024 13:18:23 -0400 Subject: [PATCH] CI: Update to AMReX 24.04 --- docker/carpetx-cpu.dockerfile | 16 ++++++++-------- docker/carpetx-cuda.dockerfile | 16 ++++++++-------- docker/carpetx-rocm.dockerfile | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile index 897bb0295..c26424c30 100644 --- a/docker/carpetx-cpu.dockerfile +++ b/docker/carpetx-cpu.dockerfile @@ -7,8 +7,8 @@ # docker push einsteintoolkit/carpetx:cpu-real32 # jammy is ubuntu:22.04 -# FROM ubuntu:jammy-20240125 -FROM ubuntu:jammy-20240212 +# FROM ubuntu:jammy-20240212 +FROM ubuntu:jammy-20240227 ENV DEBIAN_FRONTEND=noninteractive \ LANGUAGE=en_US.en \ @@ -103,9 +103,9 @@ RUN apt-get update && \ # blosc2 is a compression library, comparable to zlib RUN mkdir src && \ (cd src && \ - wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \ - tar xzf v2.13.1.tar.gz && \ - cd c-blosc2-2.13.1 && \ + wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \ + tar xzf v2.14.4.tar.gz && \ + cd c-blosc2-2.14.4 && \ cmake -B build -G Ninja -S . \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr/local \ @@ -261,9 +261,9 @@ ARG real_precision=real64 # Should we keep the AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ - tar xzf 24.02.tar.gz && \ - cd amrex-24.02 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \ + tar xzf 24.04.tar.gz && \ + cd amrex-24.04 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \ diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile index 85126ed19..f105f2fa4 100644 --- a/docker/carpetx-cuda.dockerfile +++ b/docker/carpetx-cuda.dockerfile @@ -6,8 +6,8 @@ # docker build --build-arg real_precision=real32 --file carpetx-cuda.dockerfile --tag einsteintoolkit/carpetx:cuda-real32 . # docker push einsteintoolkit/carpetx:cuda-real32 -# FROM nvidia/cuda:12.3.1-devel-ubuntu22.04 -FROM nvidia/cuda:12.3.2-devel-ubuntu22.04 +# FROM nvidia/cuda:12.3.2-devel-ubuntu22.04 +FROM nvidia/cuda:12.4.1-devel-ubuntu22.04 ENV DEBIAN_FRONTEND=noninteractive \ LANGUAGE=en_US.UTF-8 \ @@ -103,9 +103,9 @@ RUN apt-get update && \ # blosc2 is a compression library, comparable to zlib RUN mkdir src && \ (cd src && \ - wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \ - tar xzf v2.13.1.tar.gz && \ - cd c-blosc2-2.13.1 && \ + wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \ + tar xzf v2.14.4.tar.gz && \ + cd c-blosc2-2.14.4 && \ cmake -B build -G Ninja -S . \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr/local \ @@ -261,9 +261,9 @@ ARG real_precision=real64 # Should we keep the AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ - tar xzf 24.02.tar.gz && \ - cd amrex-24.02 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \ + tar xzf 24.04.tar.gz && \ + cd amrex-24.04 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \ diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile index 4021fd3e5..2f0798553 100644 --- a/docker/carpetx-rocm.dockerfile +++ b/docker/carpetx-rocm.dockerfile @@ -107,9 +107,9 @@ RUN apt-get update && \ # blosc2 is a compression library, comparable to zlib RUN mkdir src && \ (cd src && \ - wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.13.1.tar.gz && \ - tar xzf v2.13.1.tar.gz && \ - cd c-blosc2-2.13.1 && \ + wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.14.4.tar.gz && \ + tar xzf v2.14.4.tar.gz && \ + cd c-blosc2-2.14.4 && \ cmake -B build -G Ninja -S . \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr/local \ @@ -264,9 +264,9 @@ ARG real_precision=real64 # Should we keep the AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ - tar xzf 24.02.tar.gz && \ - cd amrex-24.02 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.04.tar.gz && \ + tar xzf 24.04.tar.gz && \ + cd amrex-24.04 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \