Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

intrepid2: compatibility update with kokkos-kernels #13671

Merged
merged 1 commit into from
Jan 7, 2025
Merged

intrepid2: compatibility update with kokkos-kernels #13671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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){
Expand Down Expand Up @@ -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){
Expand Down
Loading