From edea3acf7f0be57c1ee62eb3bbf7326d22404fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?= <mikolaj.zuzek@ng-analytics.com>
Date: Tue, 24 May 2022 22:16:06 +0200
Subject: [PATCH 1/2] kokkos: fix abs() namespacing

---
 tests/kokkos-based/helpers.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/kokkos-based/helpers.hpp b/tests/kokkos-based/helpers.hpp
index 77b3470d..8f5f975e 100644
--- a/tests/kokkos-based/helpers.hpp
+++ b/tests/kokkos-based/helpers.hpp
@@ -47,6 +47,12 @@
 #include <experimental/mdspan>
 #include <random>
 
+#if KOKKOS_VERSION <= 30600
+namespace Kokkos {
+  using Experimental::abs;
+}
+#endif
+
 namespace kokkostesting{
 
 template<class T>

From 40e4c619a2ef4263effe2a6e791b5ad0da14a0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Zuzek?=
 <MikolajZuzek@users.noreply.github.com>
Date: Thu, 26 May 2022 14:01:58 +0200
Subject: [PATCH 2/2] kokkos: use smarter Kokkos version number (suggested by
 @dalg24)

Co-authored-by: Damien L-G <dalg24+github@gmail.com>
---
 tests/kokkos-based/helpers.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kokkos-based/helpers.hpp b/tests/kokkos-based/helpers.hpp
index 8f5f975e..2c630449 100644
--- a/tests/kokkos-based/helpers.hpp
+++ b/tests/kokkos-based/helpers.hpp
@@ -47,7 +47,7 @@
 #include <experimental/mdspan>
 #include <random>
 
-#if KOKKOS_VERSION <= 30600
+#if KOKKOS_VERSION < 30699
 namespace Kokkos {
   using Experimental::abs;
 }