From dfc22123f11e1307ae03076ec83bab6dde7f4932 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Fri, 2 Feb 2024 14:48:46 -0500 Subject: [PATCH] docker: Update to AMReX 24.02 --- docker/carpetx-cpu.dockerfile | 9 +++++---- docker/carpetx-cuda.dockerfile | 6 +++--- docker/carpetx-rocm.dockerfile | 10 ++++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile index 484342c51..2446b8813 100644 --- a/docker/carpetx-cpu.dockerfile +++ b/docker/carpetx-cpu.dockerfile @@ -7,7 +7,8 @@ # docker push einsteintoolkit/carpetx:cpu-real32 # jammy is ubuntu:22.04 -FROM ubuntu:jammy-20240111 +# FROM ubuntu:jammy-20240111 +FROM ubuntu:jammy-20240125 ENV DEBIAN_FRONTEND=noninteractive \ LANGUAGE=en_US.en \ @@ -260,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.01.tar.gz && \ - tar xzf 24.01.tar.gz && \ - cd amrex-24.01 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ + tar xzf 24.02.tar.gz && \ + cd amrex-24.02 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \ diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile index 25ab8e4c9..f6ed7407d 100644 --- a/docker/carpetx-cuda.dockerfile +++ b/docker/carpetx-cuda.dockerfile @@ -260,9 +260,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.01.tar.gz && \ - tar xzf 24.01.tar.gz && \ - cd amrex-24.01 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ + tar xzf 24.02.tar.gz && \ + cd amrex-24.02 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \ diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile index 1eb3be7ee..4021fd3e5 100644 --- a/docker/carpetx-rocm.dockerfile +++ b/docker/carpetx-rocm.dockerfile @@ -1,3 +1,4 @@ + # How to build this Docker image: # docker build --file carpetx-rocm.dockerfile --tag einsteintoolkit/carpetx:rocm-real64 . @@ -6,7 +7,8 @@ # docker build --build-arg real_precision=real32 --file carpetx-rocm.dockerfile --tag einsteintoolkit/carpetx:rocm-real32 . # docker push einsteintoolkit/carpetx:rocm-real32 -FROM rocm/dev-ubuntu-22.04:6.0 +# FROM rocm/dev-ubuntu-22.04:6.0 +FROM rocm/dev-ubuntu-22.04:6.0.2 ENV DEBIAN_FRONTEND=noninteractive \ LANGUAGE=en_US.UTF-8 \ @@ -262,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.01.tar.gz && \ - tar xzf 24.01.tar.gz && \ - cd amrex-24.01 && \ + wget https://github.com/AMReX-Codes/amrex/archive/24.02.tar.gz && \ + tar xzf 24.02.tar.gz && \ + cd amrex-24.02 && \ case $real_precision in \ real32) precision=SINGLE;; \ real64) precision=DOUBLE;; \