From 5812d0f9f0f6ca56d2f11bbbaff37218181dac8b Mon Sep 17 00:00:00 2001
From: Nathan Ellingwood <ndellin@sandia.gov>
Date: Fri, 13 Dec 2024 19:57:09 -0700
Subject: [PATCH] intrepid2: compatibility update with kokkos-kernels

Address issue https://github.com/kokkos/kokkos-kernels/issues/2456#issuecomment-2540665787

Co-authored-by: Yuuichi Asahi <y.asahi@nr.titech.ac.jp>
Signed-off-by: Nathan Ellingwood <ndellin@sandia.gov>
---
 .../src/Projection/Intrepid2_ProjectionTools.hpp     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp b/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
index 79664a65f089..c7485e4a3563 100644
--- a/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
+++ b/packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
@@ -50,7 +50,11 @@
 #ifdef HAVE_INTREPID2_KOKKOSKERNELS
 #include "KokkosBatched_QR_Serial_Internal.hpp"
 #include "KokkosBatched_ApplyQ_Serial_Internal.hpp"
+#if KOKKOS_VERSION >= 40599
+#include "KokkosBatched_Trsv_Decl.hpp"
+#else
 #include "KokkosBatched_Trsv_Serial_Internal.hpp"
+#endif
 #include "KokkosBatched_Util.hpp"
 #endif
 
@@ -545,11 +549,15 @@ class ProjectionTools {
               w.data());
 
           // R0^{-1} b -> b
+#if KOKKOS_VERSION >= 40599
+          KokkosBatched::SerialTrsv<KokkosBatched::Uplo::Upper, KokkosBatched::Trans::NoTranspose, KokkosBatched::Diag::NonUnit, KokkosBatched::Algo::Trsv::Unblocked>::invoke(1.0, A0, b);
+#else
           KokkosBatched::SerialTrsvInternalUpper<KokkosBatched::Algo::Trsv::Unblocked>::invoke(false,
               A0.extent(0),
               1.0,
               A0.data(), A0.stride_0(), A0.stride_1(),
               b.data(),  b.stride_0());
+#endif
 
           //scattering b into the basis coefficients
           for(ordinal_type i=0; i<n; ++i){
@@ -586,11 +594,15 @@ class ProjectionTools {
               w.data());
 
           // R^{-1} b -> b
+#if KOKKOS_VERSION >= 40599
+          KokkosBatched::SerialTrsv<KokkosBatched::Uplo::Upper, KokkosBatched::Trans::NoTranspose, KokkosBatched::Diag::NonUnit, KokkosBatched::Algo::Trsv::Unblocked>::invoke(1.0, A, b);
+#else
           KokkosBatched::SerialTrsvInternalUpper<KokkosBatched::Algo::Trsv::Unblocked>::invoke(false,
               A.extent(0),
               1.0,
               A.data(), A.stride_0(), A.stride_1(),
               b.data(),  b.stride_0());
+#endif
 
           //scattering b into the basis coefficients
           for(ordinal_type i=0; i<n; ++i){