Feature: Support Kokkos Kernels v4 (#460)

LLNL · Apr 24, 2024 · 1d61bdd · 1d61bdd
1 parent b535435
commit 1d61bdd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,8 @@ Added CMake infrastructure that enables externally maintained addons/plugins
 to be *optionally* built with SUNDIALS. See the [Contributing Guide](./CONTRIBUTING.md)
 for more details.
 
+Added support for Kokkos Kernels v4.
+
 ## Changes to SUNDIALS in release v7.0.0
 
 ### Major Feature

diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst
@@ -22,3 +22,5 @@ with the Cray Fortran compiler.
 
 Fixed a bug where :c:func:`MRIStepEvolve` would not handle a recoverable error
 produced from evolving the inner stepper.
+
+Added support for Kokkos Kernels v4.
diff --git a/include/sunmatrix/sunmatrix_kokkosdense.hpp b/include/sunmatrix/sunmatrix_kokkosdense.hpp
@@ -210,7 +210,11 @@ SUNErrCode SUNMatMatvec_KokkosDense(SUNMatrix A, N_Vector x, N_Vector y)
           Kokkos::subview(y_data,
                           Kokkos::pair<size_type, size_type>(idx * rows,
                                                              (idx + 1) * rows));
+#if KOKKOSKERNELS_VERSION_MAJOR > 3
+        KokkosBlas::TeamVectorGemv<
+#else
         KokkosBatched::TeamVectorGemv<
+#endif
           member_type, KokkosBatched::Trans::NoTranspose,
           KokkosBatched::Algo::Gemv::Unblocked>::invoke(team_member,
                                                         SUN_RCONST(1.0),