From ecaa70ea6c84fde26c35cede060d329c42f8642c Mon Sep 17 00:00:00 2001
From: Frederik Hennig <frederik.hennig@fau.de>
Date: Thu, 13 Mar 2025 11:37:16 +0100
Subject: [PATCH] extend DEBUG_ENV. Fix abstract field allocator.
---
src/walberla/codegen/build_config.py | 14 ++++++++++++++
tests/BasicLbmScenarios/LbmAlgorithms.py | 6 ++----
tests/BasicLbmScenarios/SimDomain.hpp | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/walberla/codegen/build_config.py b/src/walberla/codegen/build_config.py
index df9bd71..38f9471 100644
--- a/src/walberla/codegen/build_config.py
+++ b/src/walberla/codegen/build_config.py
@@ -91,3 +91,17 @@ class WalberlaBuildConfig:
class DEBUG_ENV:
BUILD_CONFIG: WalberlaBuildConfig | None = None
+
+ @staticmethod
+ def use_hip_default():
+ DEBUG_ENV.BUILD_CONFIG = WalberlaBuildConfig(
+ c_compiler_id="hipcc",
+ cxx_compiler_id="hipcc",
+ use_double_precision=True,
+ optimize_for_localhost=False,
+ mpi_enabled=False,
+ openmp_enabled=False,
+ hip_enabled=True,
+ cuda_enabled=False,
+ likwid_enabled=False,
+ )
diff --git a/tests/BasicLbmScenarios/LbmAlgorithms.py b/tests/BasicLbmScenarios/LbmAlgorithms.py
index 08206ea..be8aadc 100644
--- a/tests/BasicLbmScenarios/LbmAlgorithms.py
+++ b/tests/BasicLbmScenarios/LbmAlgorithms.py
@@ -17,11 +17,9 @@ from lbmpy.macroscopic_value_kernels import macroscopic_values_setter
from walberla.codegen import Sweep
from walberla.codegen.boundaries import FreeSlip
-from walberla.codegen.build_config import DEBUG_ENV, WalberlaBuildConfig
+from walberla.codegen.build_config import DEBUG_ENV
-DEBUG_ENV.BUILD_CONFIG = WalberlaBuildConfig(
- "debug", "debug", True, False, True, True, False, True, False
-)
+DEBUG_ENV.use_hip_default()
with SourceFileGenerator(keep_unknown_argv=True) as sfg:
parser = argparse.ArgumentParser()
diff --git a/tests/BasicLbmScenarios/SimDomain.hpp b/tests/BasicLbmScenarios/SimDomain.hpp
index 192d17e..41532a5 100644
--- a/tests/BasicLbmScenarios/SimDomain.hpp
+++ b/tests/BasicLbmScenarios/SimDomain.hpp
@@ -177,7 +177,7 @@ struct SimDomainBuilder
#if defined(LBM_SCENARIOS_GPU_BUILD)
auto hostAlloc = make_shared< gpu::HostFieldAllocator< PdfField_T::value_type > >();
#else
- auto hostAlloc = make_shared< field::FieldAllocator< PdfField_T::value_type > >();
+ auto hostAlloc = make_shared< field::StdFieldAlloc< PdfField_T::value_type > >();
#endif
const BlockDataID pdfsId = field::addToStorage< PdfField_T >(sbfs, "f", real_c(0.0), field::fzyx, 1, hostAlloc);
--
GitLab