From dce551b6fcc7b5099341385d480128eb385bdaf3 Mon Sep 17 00:00:00 2001 From: David Bold Date: Wed, 11 Feb 2026 10:13:16 +0100 Subject: [PATCH 1/3] Do not build with openmp --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index c028d17042..809f59cf9c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,11 +26,11 @@ jobs: matrix: mpi: [mpich] metric3d: - - name: "With OpenMP" + - name: "With 3D Metrics" cmake: ON - base_prefix: "openmp-" + base_prefix: "" tag_prefix: "3d-" - - name: "Without OpenMP" + - name: "Without 3D Metrics" cmake: OFF base_prefix: "" tag_prefix: "" @@ -75,7 +75,7 @@ jobs: build-args: | BASE=${{ matrix.mpi }}-${{ matrix.metric3d.base_prefix }}${{ matrix.config.base_postfix }}-main MPI=${{ matrix.mpi }} - CMAKE_OPTIONS=${{ matrix.config.options }} -DBOUT_ENABLE_METRIC_3D=${{ matrix.metric3d.cmake }} -DBOUT_ENABLE_OPENMP=${{ matrix.metric3d.cmake }} + CMAKE_OPTIONS=${{ matrix.config.options }} -DBOUT_ENABLE_METRIC_3D=${{ matrix.metric3d.cmake }} COMMIT=${{ github.sha }} URL=${{ github.server_url }}/${{ github.repository }} context: .docker/fedora/ From e0ade7c1733c9a54e72105e4b67b0cb467faf3c9 Mon Sep 17 00:00:00 2001 From: David Bold Date: Fri, 13 Feb 2026 14:43:11 +0100 Subject: [PATCH 2/3] be verbose in docker build --- .docker/fedora/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/fedora/Dockerfile b/.docker/fedora/Dockerfile index da4d2d9fac..ed04240c4c 100644 --- a/.docker/fedora/Dockerfile +++ b/.docker/fedora/Dockerfile @@ -31,7 +31,7 @@ RUN cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr/local/ \ -DBOUT_ENABLE_PYTHON=ON \ -DBOUT_USE_SUNDIALS=ON -DSUNDIALS_ROOT=/usr/lib64/$MPI/ -DSUNDIALS_INCLUDE_DIR=/usr/include/$MPI-x86_64/sundials/ \ $CMAKE_OPTIONS || (cat /home/boutuser/BOUT-dev/build/CMakeFiles/CMake{Output,Error}.log ; exit 1); \ - make -C build -j 2; \ + make -C build -j 2 VERBOSE=1; \ sudo make -C build install; \ rm -rf build From e5cb1ebc179220551eba5a381eaac0d2f00b07b8 Mon Sep 17 00:00:00 2001 From: David Bold Date: Fri, 13 Feb 2026 14:49:22 +0100 Subject: [PATCH 3/3] [container] Set build type --- .docker/fedora/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/fedora/Dockerfile b/.docker/fedora/Dockerfile index ed04240c4c..7d5c04418d 100644 --- a/.docker/fedora/Dockerfile +++ b/.docker/fedora/Dockerfile @@ -26,6 +26,7 @@ ENV HOME=/home/boutuser WORKDIR /home/boutuser/BOUT-dev RUN cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr/local/ \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBOUT_GENERATE_FIELDOPS=OFF \ -DBOUT_USE_PETSC=ON -DPETSc_ROOT=/usr/local \ -DBOUT_ENABLE_PYTHON=ON \