From 473894014031c4428f452854e6487ec2c7fc8ed4 Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Mon, 24 Mar 2025 10:10:33 +0100
Subject: [PATCH] update requirements and dependencies
---
codegen-requirements.txt | 2 +-
tests/BasicLbmScenarios/CMakeLists.txt | 2 +-
tests/CMakeLists.txt | 10 +++++++++-
tests/CMakePresets.json | 14 ++++++++++++++
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/codegen-requirements.txt b/codegen-requirements.txt
index 4ff585b..da4b7e0 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/devel
+git+https://i10git.cs.fau.de/pycodegen/pystencils-sfg.git@fhennig/postprocessing-fixes
diff --git a/tests/BasicLbmScenarios/CMakeLists.txt b/tests/BasicLbmScenarios/CMakeLists.txt
index 42a1ced..2501346 100644
--- a/tests/BasicLbmScenarios/CMakeLists.txt
+++ b/tests/BasicLbmScenarios/CMakeLists.txt
@@ -16,7 +16,7 @@ endforeach()
if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
- find_package( CUDAToolkit )
+ find_package( CUDAToolkit REQUIRED )
# Workaround: CUDA headers are included in core/timing
target_link_libraries( TestBasicLbmScenariosCPU PRIVATE CUDA::cudart )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1d719cb..2ba5b0b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,13 @@
cmake_minimum_required( VERSION 3.24 )
-project( sfg-walberla-testsuite LANGUAGES CXX CUDA )
+project( sfg-walberla-testsuite LANGUAGES CXX )
+
+if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
+ enable_language( CUDA )
+endif()
+
+if( $CACHE{WALBERLA_BUILD_WITH_HIP} )
+ enable_language( HIP )
+endif()
set(WALBERLA_BUILD_TESTS OFF CACHE BOOL "")
set(WALBERLA_BUILD_BENCHMARKS OFF CACHE BOOL "")
diff --git a/tests/CMakePresets.json b/tests/CMakePresets.json
index a064ccf..d14bb51 100644
--- a/tests/CMakePresets.json
+++ b/tests/CMakePresets.json
@@ -25,6 +25,20 @@
"WALBERLA_BUILD_WITH_CUDA": true,
"CMAKE_CUDA_ARCHITECTURES": "native"
}
+ },
+ {
+ "name": "testsuite-dbg-hip",
+ "binaryDir": "${sourceDir}/build/${presetName}",
+ "generator": "Ninja",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "WALBERLA_BUILD_TESTS": false,
+ "WALBERLA_BUILD_WITH_HIP": true
+ },
+ "environment": {
+ "CC": "hipcc",
+ "CXX": "hipcc"
+ }
}
]
}
--
GitLab