From a010a7e6f96fa44bf46b9ec0ffd1657114c3af00 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Wed, 26 Mar 2025 09:31:09 +0100
Subject: [PATCH] bump pystencils-sfg. Use Release mode for test suite. Update
CI containers.
---
.gitlab-ci.yml | 18 ++++++++++--------
codegen-requirements.txt | 2 +-
.../TestBasicLbmScenarios.cpp | 2 +-
tests/CMakePresets.json | 12 ++++++------
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fed16df..f7f98e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,8 +29,7 @@ typecheck:
# -------------------- C++ Test Suite ---------------------------------------------------------------------
-.testsuite-base:
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-18:latest
+.testsuite:
stage: "Test"
needs: []
before_script:
@@ -42,21 +41,24 @@ typecheck:
script:
- ctest
-testsuite-clang18-cpu:
- extends: .testsuite-base
+.clang-19:
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-19:latest
+
+testsuite-clang19-cpu:
+ extends: [.testsuite, .clang-19]
tags:
- docker
- AVX2
variables:
- cmakePresetName: testsuite-dbg-cpu
+ cmakePresetName: testsuite-cpu
-testsuite-clang18-cuda:
- extends: .testsuite-base
+testsuite-clang19-cuda:
+ extends: [.testsuite, .clang-19]
tags:
- docker
- cuda11
variables:
- cmakePresetName: testsuite-dbg-cuda
+ cmakePresetName: testsuite-cuda
# -------------------- User Manual ---------------------------------------------------------------------
diff --git a/codegen-requirements.txt b/codegen-requirements.txt
index da4b7e0..c7448f6 100644
--- a/codegen-requirements.txt
+++ b/codegen-requirements.txt
@@ -5,4 +5,4 @@ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@v2.0-dev
git+https://i10git.cs.fau.de/pycodegen/lbmpy.git@fhennig/pystencils2.0-compat
# pystencils-sfg: master
-git+https://i10git.cs.fau.de/pycodegen/pystencils-sfg.git@fhennig/postprocessing-fixes
+git+https://i10git.cs.fau.de/pycodegen/pystencils-sfg.git
diff --git a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
index 2aca129..74a4953 100644
--- a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
+++ b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
@@ -130,7 +130,7 @@ void mirroredHalfChannel(mpi::Environment& env)
});
});
- // velOutput();
+ velOutput();
dom.forAllBlocks([&](IBlock& b) {
noSlipTop(&b);
diff --git a/tests/CMakePresets.json b/tests/CMakePresets.json
index 66a4b6e..6528f71 100644
--- a/tests/CMakePresets.json
+++ b/tests/CMakePresets.json
@@ -7,31 +7,31 @@
},
"configurePresets": [
{
- "name": "testsuite-dbg-cpu",
+ "name": "testsuite-cpu",
"binaryDir": "${sourceDir}/build/${presetName}",
"generator": "Ninja",
"cacheVariables": {
- "CMAKE_BUILD_TYPE": "Debug",
+ "CMAKE_BUILD_TYPE": "Release",
"WALBERLA_BUILD_TESTS": false
}
},
{
- "name": "testsuite-dbg-cuda",
+ "name": "testsuite-cuda",
"binaryDir": "${sourceDir}/build/${presetName}",
"generator": "Ninja",
"cacheVariables": {
- "CMAKE_BUILD_TYPE": "Debug",
+ "CMAKE_BUILD_TYPE": "Release",
"WALBERLA_BUILD_TESTS": false,
"WALBERLA_BUILD_WITH_CUDA": true,
"CMAKE_CUDA_ARCHITECTURES": "native"
}
},
{
- "name": "testsuite-dbg-hip",
+ "name": "testsuite-hip",
"binaryDir": "${sourceDir}/build/${presetName}",
"generator": "Ninja",
"cacheVariables": {
- "CMAKE_BUILD_TYPE": "Debug",
+ "CMAKE_BUILD_TYPE": "Release",
"WALBERLA_BUILD_TESTS": false,
"WALBERLA_BUILD_WITH_HIP": true
}
--
GitLab