diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile index 05e1be99d..836b69d90 100644 --- a/docker/carpetx-cpu.dockerfile +++ b/docker/carpetx-cpu.dockerfile @@ -141,9 +141,9 @@ RUN mkdir src && \ # ssht provides spin-weighted spherical harmonics RUN mkdir src && \ (cd src && \ - wget https://github.com/astro-informatics/ssht/archive/v1.5.1.tar.gz && \ - tar xzf v1.5.1.tar.gz && \ - cd ssht-1.5.1 && \ + wget https://github.com/astro-informatics/ssht/archive/v1.5.2.tar.gz && \ + tar xzf v1.5.2.tar.gz && \ + cd ssht-1.5.2 && \ mkdir build && \ cd build && \ cmake .. && \ @@ -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.06.tar.gz && \ - tar xzf 23.06.tar.gz && \ - cd amrex-23.06 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ + tar xzf 23.07.tar.gz && \ + cd amrex-23.07 && \ mkdir build && \ cd build && \ case $real_precision in \ diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile index 2866cde41..2506d82b1 100644 --- a/docker/carpetx-cuda.dockerfile +++ b/docker/carpetx-cuda.dockerfile @@ -6,7 +6,7 @@ # 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.1.1-devel-ubuntu22.04 +FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 RUN mkdir /cactus WORKDIR /cactus @@ -141,9 +141,9 @@ RUN mkdir src && \ # ssht provides spin-weighted spherical harmonics RUN mkdir src && \ (cd src && \ - wget https://github.com/astro-informatics/ssht/archive/v1.5.1.tar.gz && \ - tar xzf v1.5.1.tar.gz && \ - cd ssht-1.5.1 && \ + wget https://github.com/astro-informatics/ssht/archive/v1.5.2.tar.gz && \ + tar xzf v1.5.2.tar.gz && \ + cd ssht-1.5.2 && \ mkdir build && \ cd build && \ cmake .. && \ @@ -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.06.tar.gz && \ - tar xzf 23.06.tar.gz && \ - cd amrex-23.06 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ + tar xzf 23.07.tar.gz && \ + cd amrex-23.07 && \ mkdir build && \ cd build && \ case $real_precision in \ diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile index 722324735..d15876d16 100644 --- a/docker/carpetx-rocm.dockerfile +++ b/docker/carpetx-rocm.dockerfile @@ -6,8 +6,10 @@ # 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 +# 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 WORKDIR /cactus @@ -144,9 +146,9 @@ RUN mkdir src && \ # ssht provides spin-weighted spherical harmonics RUN mkdir src && \ (cd src && \ - wget https://github.com/astro-informatics/ssht/archive/v1.5.1.tar.gz && \ - tar xzf v1.5.1.tar.gz && \ - cd ssht-1.5.1 && \ + wget https://github.com/astro-informatics/ssht/archive/v1.5.2.tar.gz && \ + tar xzf v1.5.2.tar.gz && \ + cd ssht-1.5.2 && \ mkdir build && \ cd build && \ cmake .. && \ @@ -179,9 +181,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.06.tar.gz && \ - tar xzf 23.06.tar.gz && \ - cd amrex-23.06 && \ + wget https://github.com/AMReX-Codes/amrex/archive/23.07.tar.gz && \ + tar xzf 23.07.tar.gz && \ + cd amrex-23.07 && \ mkdir build && \ cd build && \ case $real_precision in \