Merge pull request #306 from EinsteinToolkit/eschnett/ci-amrex-24.09

CI: Update to AMReX 24.09
EinsteinToolkit · Sep 1, 2024 · e20789f · e20789f
2 parents d3d1e95 + 26ce55c
commit e20789f
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 57 deletions.
diff --git a/docker/carpetx-arm64v8-cpu.dockerfile b/docker/carpetx-arm64v8-cpu.dockerfile
@@ -7,8 +7,8 @@
 #     docker push einsteintoolkit/carpetx:arm64v8-cpu-real32
 
 # noble is ubuntu:24.04
-# FROM arm64v8/ubuntu:noble-20240530
-FROM arm64v8/ubuntu:noble-20240605
+# FROM arm64v8/ubuntu:noble-20240605
+FROM arm64v8/ubuntu:noble-20240801
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -25,6 +25,7 @@ WORKDIR /cactus
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -107,9 +108,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.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -267,10 +268,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -285,9 +286,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.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.09.tar.gz && \
+    tar xzf 24.09.tar.gz && \
+    cd amrex-24.09 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \

diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile
@@ -7,8 +7,8 @@
 #     docker push einsteintoolkit/carpetx:cpu-real32
 
 # noble is ubuntu:24.04
-# FROM ubuntu:noble-20240530
-FROM ubuntu:noble-20240605
+# FROM ubuntu:noble-20240605
+FROM ubuntu:noble-20240801
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -26,6 +26,7 @@ RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         bzip2 \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -117,9 +118,9 @@ RUN mkdir src && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -277,10 +278,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -295,9 +296,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.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.09.tar.gz && \
+    tar xzf 24.09.tar.gz && \
+    cd amrex-24.09 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \

diff --git 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.5.1-devel-ubuntu22.04
 FROM nvidia/cuda:12.5.1-devel-ubuntu24.04
+#TODO FROM nvidia/cuda:12.6.0-devel-ubuntu24.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -24,6 +24,7 @@ WORKDIR /cactus
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -105,9 +106,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.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -265,10 +266,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -283,9 +284,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.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.09.tar.gz && \
+    tar xzf 24.09.tar.gz && \
+    cd amrex-24.09 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \

diff --git a/docker/carpetx-oneapi.dockerfile b/docker/carpetx-oneapi.dockerfile
@@ -6,8 +6,8 @@
 #     docker build --build-arg real_precision=real32 --file carpetx-oneapi.dockerfile --tag einsteintoolkit/carpetx:oneapi-real32 .
 #     docker push einsteintoolkit/carpetx:oneapi-real32
 
-# FROM intel/oneapi-basekit:2024.2.0-devel-ubuntu22.04
-FROM intel/oneapi-basekit:2024.2.0-1-devel-ubuntu22.04
+# FROM intel/oneapi-basekit:2024.2.0-1-devel-ubuntu22.04
+FROM intel/oneapi-basekit:2024.2.1-0-devel-ubuntu22.04
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -23,6 +23,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 28DA432DAAC8BAEA &&
     apt-get update --allow-insecure-repositories && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -84,9 +85,9 @@ RUN find /opt/intel -name 'impi.pc' -delete && \
 # blosc2 is a compression library, comparable to zlib
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -243,10 +244,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -261,10 +262,10 @@ 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.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.09.tar.gz && \
+    tar xzf 24.09.tar.gz && \
     rm -rf /opt/intel/oneapi/mpi && \
-    cd amrex-24.08 && \
+    cd amrex-24.09 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \

diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile
@@ -24,6 +24,7 @@ WORKDIR /cactus
 RUN apt-get update && \
     apt-get --yes --no-install-recommends install \
         ca-certificates \
+        clang-format \
         cmake \
         cvs \
         diffutils \
@@ -108,9 +109,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.15.0.tar.gz && \
-    tar xzf v2.15.0.tar.gz && \
-    cd c-blosc2-2.15.0 && \
+    wget https://github.com/Blosc/c-blosc2/archive/refs/tags/v2.15.1.tar.gz && \
+    tar xzf v2.15.1.tar.gz && \
+    cd c-blosc2-2.15.1 && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -267,10 +268,10 @@ RUN mkdir src && \
     tar xzf v1.5.2.tar.gz && \
     cd ssht-1.5.2 && \
     cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_INSTALL_PREFIX=/usr/local \
-            -DBUILD_TESTING=OFF \
-            && \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DBUILD_TESTING=OFF \
+        && \
     cmake --build build && \
     cmake --install build && \
     true) && \
@@ -285,9 +286,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.08.tar.gz && \
-    tar xzf 24.08.tar.gz && \
-    cd amrex-24.08 && \
+    wget https://github.com/AMReX-Codes/amrex/archive/24.09.tar.gz && \
+    tar xzf 24.09.tar.gz && \
+    cd amrex-24.09 && \
     case $real_precision in \
         real32) precision=SINGLE;; \
         real64) precision=DOUBLE;; \