From c55f50da490a5dee43dc1db6ef39de40be27c128 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Mon, 23 Dec 2024 12:31:20 -0500
Subject: [PATCH] CI: Update Dockerfiles

---
 docker/carpetx-arm64v8-cpu.dockerfile |  4 ++++
 docker/carpetx-cpu.dockerfile         |  4 ++++
 docker/carpetx-cuda.dockerfile        |  4 ++++
 docker/carpetx-oneapi.dockerfile      |  4 ++++
 docker/carpetx-rocm.dockerfile        |  4 ++++
 docker/patches/openPMD-api.patch      | 11 +++++++++++
 6 files changed, 31 insertions(+)
 create mode 100644 docker/patches/openPMD-api.patch

diff --git a/docker/carpetx-arm64v8-cpu.dockerfile b/docker/carpetx-arm64v8-cpu.dockerfile
index 4976aa7a6..5db7fd265 100644
--- a/docker/carpetx-arm64v8-cpu.dockerfile
+++ b/docker/carpetx-arm64v8-cpu.dockerfile
@@ -225,6 +225,8 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+COPY patches/openPMD-api.patch /cactus/patches/
+
 # Install openPMD-api
 # openPMD-api defines a standard for laying out AMR data in a file
 # - depends on ADIOS2
@@ -233,6 +235,8 @@ RUN mkdir src && \
     wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
     tar xzf 0.16.0.tar.gz && \
     cd openPMD-api-0.16.0 && \
+    patch -p1 </cactus/patches/openPMD-api.patch && \
+    rm /cactus/patches/openPMD-api.patch && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile
index 752e742c2..548ef7914 100644
--- a/docker/carpetx-cpu.dockerfile
+++ b/docker/carpetx-cpu.dockerfile
@@ -225,6 +225,8 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+COPY patches/openPMD-api.patch /cactus/patches/
+
 # Install openPMD-api
 # openPMD-api defines a standard for laying out AMR data in a file
 # - depends on ADIOS2
@@ -233,6 +235,8 @@ RUN mkdir src && \
     wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
     tar xzf 0.16.0.tar.gz && \
     cd openPMD-api-0.16.0 && \
+    patch -p1 </cactus/patches/openPMD-api.patch && \
+    rm /cactus/patches/openPMD-api.patch && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile
index 6f03bd7cc..f9b303126 100644
--- a/docker/carpetx-cuda.dockerfile
+++ b/docker/carpetx-cuda.dockerfile
@@ -212,6 +212,8 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+COPY patches/openPMD-api.patch /cactus/patches/
+
 # Install openPMD-api
 # openPMD-api defines a standard for laying out AMR data in a file
 # - depends on ADIOS2
@@ -220,6 +222,8 @@ RUN mkdir src && \
     wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
     tar xzf 0.16.0.tar.gz && \
     cd openPMD-api-0.16.0 && \
+    patch -p1 </cactus/patches/openPMD-api.patch && \
+    rm /cactus/patches/openPMD-api.patch && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/docker/carpetx-oneapi.dockerfile b/docker/carpetx-oneapi.dockerfile
index 83a88a771..e2fcbfd62 100644
--- a/docker/carpetx-oneapi.dockerfile
+++ b/docker/carpetx-oneapi.dockerfile
@@ -192,6 +192,8 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+COPY patches/openPMD-api.patch /cactus/patches/
+
 # Install openPMD-api
 # openPMD-api defines a standard for laying out AMR data in a file
 # - depends on ADIOS2
@@ -200,6 +202,8 @@ RUN mkdir src && \
     wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
     tar xzf 0.16.0.tar.gz && \
     cd openPMD-api-0.16.0 && \
+    patch -p1 </cactus/patches/openPMD-api.patch && \
+    rm /cactus/patches/openPMD-api.patch && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile
index 0d67b5553..2ec9720fb 100644
--- a/docker/carpetx-rocm.dockerfile
+++ b/docker/carpetx-rocm.dockerfile
@@ -216,6 +216,8 @@ RUN mkdir src && \
     true) && \
     rm -rf src
 
+COPY patches/openPMD-api.patch /cactus/patches/
+
 # Install openPMD-api
 # openPMD-api defines a standard for laying out AMR data in a file
 # - depends on ADIOS2
@@ -224,6 +226,8 @@ RUN mkdir src && \
     wget https://github.com/openPMD/openPMD-api/archive/refs/tags/0.16.0.tar.gz && \
     tar xzf 0.16.0.tar.gz && \
     cd openPMD-api-0.16.0 && \
+    patch -p1 </cactus/patches/openPMD-api.patch && \
+    rm /cactus/patches/openPMD-api.patch && \
     cmake -B build -G Ninja \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/docker/patches/openPMD-api.patch b/docker/patches/openPMD-api.patch
new file mode 100644
index 000000000..f3a610a74
--- /dev/null
+++ b/docker/patches/openPMD-api.patch
@@ -0,0 +1,11 @@
+--- a/include/openPMD/backend/Container.hpp
++++ b/include/openPMD/backend/Container.hpp
+@@ -259,7 +259,7 @@
+ 
+     void swap(Container &other)
+     {
+-        container().swap(other.m_container);
++        container().swap(other.container());
+     }
+ 
+     mapped_type &at(key_type const &key)