From ae49bc2dda9968b730085f24354aff89a8c66034 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 2 Aug 2023 13:53:47 -0400 Subject: [PATCH] CI: Update to ARMeX 23.08 --- docker/carpetx-cpu.dockerfile | 6 +++--- docker/carpetx-cuda.dockerfile | 6 +++--- docker/carpetx-rocm.dockerfile | 9 +++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile index 836b69d90..ff9ea2bdd 100644 --- a/docker/carpetx-cpu.dockerfile +++ b/docker/carpetx-cpu.dockerfile @@ -176,9 +176,9 @@ ARG real_precision=real64 # Should we keep AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ - tar xzf 23.07.tar.gz && \ - cd amrex-23.07 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.08.tar.gz && \ + tar xzf 23.08.tar.gz && \ + cd amrex-23.08 && \ mkdir build && \ cd build && \ case $real_precision in \ diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile index e7f216662..cd9876b0a 100644 --- a/docker/carpetx-cuda.dockerfile +++ b/docker/carpetx-cuda.dockerfile @@ -176,9 +176,9 @@ ARG real_precision=real64 # Should we keep AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ - tar xzf 23.07.tar.gz && \ - cd amrex-23.07 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.08.tar.gz && \ + tar xzf 23.08.tar.gz && \ + cd amrex-23.08 && \ mkdir build && \ cd build && \ case $real_precision in \ diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile index d15876d16..d58622054 100644 --- a/docker/carpetx-rocm.dockerfile +++ b/docker/carpetx-rocm.dockerfile @@ -6,9 +6,6 @@ # 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:5.4.2 -# The following need amrex-23.07 for proper C++17 support: -# FROM rocm/dev-ubuntu-22.04:5.5.1 FROM rocm/dev-ubuntu-22.04:5.6 RUN mkdir /cactus @@ -181,9 +178,9 @@ ARG real_precision=real64 # Should we keep AMReX source tree around for debugging? RUN mkdir src && \ (cd src && \ - wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ - tar xzf 23.07.tar.gz && \ - cd amrex-23.07 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.08.tar.gz && \ + tar xzf 23.08.tar.gz && \ + cd amrex-23.08 && \ mkdir build && \ cd build && \ case $real_precision in \