From d4cc8ca40ba5357499a8f1d8eadb01dc5935209d Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Tue, 25 Mar 2025 13:44:23 +0100
Subject: [PATCH] fix HIP language
---
tests/BasicLbmScenarios/CMakeLists.txt | 6 ++----
tests/CMakeLists.txt | 8 ++++++++
tests/CMakePresets.json | 4 ----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/BasicLbmScenarios/CMakeLists.txt b/tests/BasicLbmScenarios/CMakeLists.txt
index 2501346..ea261fe 100644
--- a/tests/BasicLbmScenarios/CMakeLists.txt
+++ b/tests/BasicLbmScenarios/CMakeLists.txt
@@ -35,13 +35,11 @@ if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
endif()
if( $CACHE{WALBERLA_BUILD_WITH_HIP} )
- find_package(hip REQUIRED)
-
- set( _codegen_suffixes hpp cpp )
+ set( _codegen_suffixes hpp hip )
add_executable( TestBasicLbmScenariosHIP TestBasicLbmScenarios.cpp )
walberla_generate_sources( TestBasicLbmScenariosHIP SCRIPTS LbmAlgorithms.py SCRIPT_ARGS --target=hip FILE_EXTENSIONS ${_codegen_suffixes} )
- target_link_libraries( TestBasicLbmScenariosHIP PRIVATE walberla::core walberla::blockforest walberla::field walberla::gpu walberla::geometry walberla::experimental hip::host )
+ target_link_libraries( TestBasicLbmScenariosHIP PRIVATE walberla::core walberla::blockforest walberla::field walberla::gpu walberla::geometry walberla::experimental )
add_dependencies( SfgTests TestBasicLbmScenariosHIP )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2ba5b0b..96520fa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,6 +27,14 @@ FetchContent_Declare(
message( STATUS "Fetching waLBerla sources (this might take a while)..." )
FetchContent_MakeAvailable(walberla)
+# Workarounds for CUDA and HIP library dependencies
+if( $CACHE{WALBERLA_BUILD_WITH_HIP})
+ find_package(hip REQUIRED)
+
+ target_link_libraries( walberla_core PUBLIC hip::host )
+ target_link_libraries( walberla_gpu PUBLIC hip::host )
+endif()
+
add_subdirectory(${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR}/sfg-walberla)
# Test Directories
diff --git a/tests/CMakePresets.json b/tests/CMakePresets.json
index d14bb51..66a4b6e 100644
--- a/tests/CMakePresets.json
+++ b/tests/CMakePresets.json
@@ -34,10 +34,6 @@
"CMAKE_BUILD_TYPE": "Debug",
"WALBERLA_BUILD_TESTS": false,
"WALBERLA_BUILD_WITH_HIP": true
- },
- "environment": {
- "CC": "hipcc",
- "CXX": "hipcc"
}
}
]
--
GitLab