From 8ee6421e0c417840c21fb18e7926fbd55b6217d4 Mon Sep 17 00:00:00 2001 From: David Bold Date: Tue, 24 Feb 2026 13:10:55 +0100 Subject: [PATCH 1/6] CI: Update ci-cuda tests to maintained workflow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f44ebb87ec..5d23921424 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -235,7 +235,7 @@ jobs: CUDA: timeout-minutes: 60 runs-on: ubuntu-latest - container: ghcr.io/ggeorgakoudis/boutdev-cuda:latest + container: ghcr.io/boutproject/bout-container-base:ci-cuda env: BOUT_TEST_DOWNLOAD_FLAGS: --retry-on-http-error=502,503,504 --tries 3 steps: From b6cadf787752ce10713ec07b32c28bb845d86527 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Thu, 26 Feb 2026 17:32:31 +0000 Subject: [PATCH 2/6] CI: Set `CMAKE_CUDA_HOST_COMPILER` for CUDA build Also update build name --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d23921424..0b3ec3b1a4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -250,7 +250,7 @@ jobs: # If we update the test, invalidate the cache key: zenodo-data-${{ hashFiles('tests/integrated/test-fci-mpi/CMakeLists.txt') }} - - name: Build minimal CUDA 12.2 @ GCC9.4.0 @ Ubuntu 20.04 + - name: Build minimal CUDA 12.6 @ GCC11 @ Ubuntu 22.04 run: | . /spack/share/spack/setup-env.sh spack env activate -p /spack-env @@ -259,6 +259,7 @@ jobs: cmake -S $GITHUB_WORKSPACE -B build \ -DCMAKE_C_COMPILER=gcc \ -DCMAKE_CXX_COMPILER=g++ \ + -DCMAKE_CUDA_HOST_COMPILER=g++ \ -DBOUT_ENABLE_RAJA=on \ -DBOUT_ENABLE_UMPIRE=on \ -DBOUT_ENABLE_CUDA=on \ From 462de370dc9c79dc937be9d778832b80bdffdd18 Mon Sep 17 00:00:00 2001 From: David Bold Date: Fri, 27 Feb 2026 11:03:37 +0100 Subject: [PATCH 3/6] activate env using provided script --- .github/workflows/tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0b3ec3b1a4..db9b7ab3ac 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -252,8 +252,7 @@ jobs: - name: Build minimal CUDA 12.6 @ GCC11 @ Ubuntu 22.04 run: | - . /spack/share/spack/setup-env.sh - spack env activate -p /spack-env + . /usr/local/bin/bout-env.bash git config --global --add safe.directory $GITHUB_WORKSPACE rm -rf build cmake -S $GITHUB_WORKSPACE -B build \ From 8d1758c14841a203d8a36b72ff1d94177c139b99 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Mon, 9 Mar 2026 14:57:15 +0000 Subject: [PATCH 4/6] CI: Try using bundled `fmt` for CUDA build --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index db9b7ab3ac..4439fea58d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -265,6 +265,6 @@ jobs: -DCMAKE_CUDA_ARCHITECTURES=80 \ -DCUDA_ARCH=compute_80,code=sm_80 \ -DBOUT_ENABLE_WARNINGS=off \ - -DBOUT_USE_SYSTEM_FMT=on + -DBOUT_ENABLE_WARNINGS=off cd build make -j 4 From 6f705190cfb6f51cfeb8eacec61ca5cc44625d13 Mon Sep 17 00:00:00 2001 From: ZedThree <1486942+ZedThree@users.noreply.github.com> Date: Mon, 9 Mar 2026 15:02:50 +0000 Subject: [PATCH 5/6] [bot] Apply format changes --- include/bout/field3d.hxx | 2 +- src/mesh/parallel/fci.cxx | 4 ++-- src/mesh/parallel/fci.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/bout/field3d.hxx b/include/bout/field3d.hxx index a75e38df36..6e794a83a8 100644 --- a/include/bout/field3d.hxx +++ b/include/bout/field3d.hxx @@ -567,7 +567,7 @@ void checkData(const Field3D& f, const std::string& region = "RGN_NOBNDRY"); /// Ignored with disabled CHECK; Throw an exception if \p f is not /// allocated or if any elements are non-finite (for CHECK > 2) inline void checkData(const Field3D& UNUSED(f), - const std::string& UNUSED(region) = "RGN_NOBNDRY"){}; + const std::string& UNUSED(region) = "RGN_NOBNDRY") {}; #endif /// Fourier filtering, removes all except one mode diff --git a/src/mesh/parallel/fci.cxx b/src/mesh/parallel/fci.cxx index 08e56584e1..7832e48fc6 100644 --- a/src/mesh/parallel/fci.cxx +++ b/src/mesh/parallel/fci.cxx @@ -309,8 +309,8 @@ void FCITransform::checkInputGrid() { "to generate metric components for FCITransform. Should be 'fci'."); } } // else: parallel_transform variable not found in grid input, indicates older input - // file or grid from options so must rely on the user having ensured the type is - // correct + // file or grid from options so must rely on the user having ensured the type is + // correct } void FCITransform::calcParallelSlices(Field3D& f) { diff --git a/src/mesh/parallel/fci.hxx b/src/mesh/parallel/fci.hxx index 1a02f558e1..74922bd0e5 100644 --- a/src/mesh/parallel/fci.hxx +++ b/src/mesh/parallel/fci.hxx @@ -73,7 +73,7 @@ public: FCITransform() = delete; FCITransform(Mesh& mesh, const Coordinates::FieldMetric& dy, bool zperiodic = true, Options* opt = nullptr) - : ParallelTransform(mesh, opt), R{&mesh}, Z{&mesh} { + : ParallelTransform(mesh, opt), R{&mesh}, Z{&mesh} { // check the coordinate system used for the grid data source FCITransform::checkInputGrid(); From fd3e4affbc86678da8adf96f2268a82a8e73a0af Mon Sep 17 00:00:00 2001 From: ZedThree <1486942+ZedThree@users.noreply.github.com> Date: Mon, 9 Mar 2026 15:02:52 +0000 Subject: [PATCH 6/6] [bot] Add last format changes commit to ignore file --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 010100588c..7ef369d4c4 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,3 +8,4 @@ ed2117e6d6826a98b6988e2f18c0c34e408563b6 a71cad2dd6ace5741a754e2ca7daacd4bb094e0e 2c2402ed59c91164eaff46dee0f79386b7347e9e 05b7c571544c3bcb153fce67d12b9ac48947fc2d +6f705190cfb6f51cfeb8eacec61ca5cc44625d13