From bb092b91c5283ed306b3e1c2384fb4c932f25e95 Mon Sep 17 00:00:00 2001
From: Joana Niermann <joana.niermann@cern.ch>
Date: Thu, 4 Sep 2025 09:08:13 +0000
Subject: [PATCH] Move hip runtime for assertion into dedicated header

---
 common/include/algebra/assert.hpp                 | 15 +++++++++++++++
 .../include/algebra/storage/impl/cmath_getter.hpp |  6 +-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 common/include/algebra/assert.hpp

diff --git a/common/include/algebra/assert.hpp b/common/include/algebra/assert.hpp
new file mode 100644
index 00000000..eddbd30b
--- /dev/null
+++ b/common/include/algebra/assert.hpp
@@ -0,0 +1,15 @@
+/**
+ * ALGEBRA PLUGIN library, part of the ACTS project (R&D line)
+ *
+ * (c) 2025 CERN for the benefit of the ACTS project
+ *
+ * Mozilla Public License Version 2.0
+ */
+
+#pragma once
+
+#include <cassert>
+
+#if defined(__HIP__)
+#include <hip/hip_runtime.h>
+#endif
diff --git a/storage/cmath/include/algebra/storage/impl/cmath_getter.hpp b/storage/cmath/include/algebra/storage/impl/cmath_getter.hpp
index 5f6e6894..1dc504e7 100644
--- a/storage/cmath/include/algebra/storage/impl/cmath_getter.hpp
+++ b/storage/cmath/include/algebra/storage/impl/cmath_getter.hpp
@@ -8,19 +8,15 @@
 #pragma once
 
 // Project include(s).
+#include "algebra/assert.hpp"
 #include "algebra/concepts.hpp"
 #include "algebra/math/common.hpp"
 #include "algebra/qualifiers.hpp"
 
 // System include(s).
-#include <cassert>
 #include <cstddef>
 #include <type_traits>
 
-#if defined(__HIP__)
-#include <hip/hip_runtime.h>
-#endif
-
 namespace algebra::cmath::storage {
 
 /// "Element getter", assuming a simple 2D array access