Skip to content

CI: Update ci-cuda tests to maintained workflow #3282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dschwoerer wants to merge 6 commits into from
Closed

CI: Update ci-cuda tests to maintained workflow #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ee6421
CI: Update ci-cuda tests to maintained workflow
dschwoerer Feb 24, 2026
b6cadf7
CI: Set `CMAKE_CUDA_HOST_COMPILER` for CUDA build
ZedThree Feb 26, 2026
462de37
activate env using provided script
dschwoerer Feb 27, 2026
8d1758c
CI: Try using bundled `fmt` for CUDA build
ZedThree Mar 9, 2026
6f70519
[bot] Apply format changes
ZedThree Mar 9, 2026
fd3e4af
[bot] Add last format changes commit to ignore file
ZedThree Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ ed2117e6d6826a98b6988e2f18c0c34e408563b6
a71cad2dd6ace5741a754e2ca7daacd4bb094e0e
2c2402ed59c91164eaff46dee0f79386b7347e9e
05b7c571544c3bcb153fce67d12b9ac48947fc2d
6f705190cfb6f51cfeb8eacec61ca5cc44625d13
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -250,21 +250,21 @@ 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
Copy link
Member

@ZedThree ZedThree Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason the base image is using ubuntu 22.04 rather than the 24.04 LTS version?

Copy link
Contributor Author

@dschwoerer dschwoerer Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's see whether we can update to 24.04 and cuda 13.1.1:
https://github.com/boutproject/bout-container-base/actions/runs/22481022925

Copy link
Member

@ZedThree ZedThree Feb 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, please could you also bump fmt to 12.x?

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 \
-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 \
-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
2 changes: 1 addition & 1 deletion include/bout/field3d.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/mesh/parallel/fci.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/mesh/parallel/fci.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down