Skip to content

Commit

Permalink
Deprecated remarks to trsv serial impl (#2461)
Browse files Browse the repository at this point in the history 
* Add deprecated warnings for older interfaces of serial trsv

Signed-off-by: Yuuichi Asahi <[email protected]>

* use if constexpr for selective interface of trsv

Signed-off-by: Yuuichi Asahi <[email protected]>

* format

Signed-off-by: Yuuichi Asahi <[email protected]>

* format

Signed-off-by: Yuuichi Asahi <[email protected]>

---------

Signed-off-by: Yuuichi Asahi <[email protected]>
Co-authored-by: Yuuichi Asahi <[email protected]>
  • Loading branch information
@yasahi-hpc
yasahi-hpc and Yuuichi Asahi authored Dec 16, 2024
1 parent f23260a commit 1a0c46b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 15 deletions.
21 changes: 21 additions & 0 deletions batched/dense/impl/KokkosBatched_Trsv_Serial_Internal.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,27 @@ KOKKOS_INLINE_FUNCTION int SerialTrsvInternalUpper<Algo::Trsv::Blocked>::invoke(
}

} // namespace Impl

template <typename AlgoType>
struct [[deprecated("Use KokkosBatched::SerialTrsv instead")]] SerialTrsvInternalLower {
template <typename ScalarType, typename ValueType>
KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag, const int m, const ScalarType alpha,
const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
/**/ ValueType *KOKKOS_RESTRICT b, const int bs0) {
return Impl::SerialTrsvInternalLower<AlgoType>::invoke(use_unit_diag, false, m, alpha, A, as0, as1, b, bs0);
}
};

template <typename AlgoType>
struct [[deprecated("Use KokkosBatched::SerialTrsv instead")]] SerialTrsvInternalUpper {
template <typename ScalarType, typename ValueType>
KOKKOS_INLINE_FUNCTION static int invoke(const bool use_unit_diag, const int m, const ScalarType alpha,
const ValueType *KOKKOS_RESTRICT A, const int as0, const int as1,
/**/ ValueType *KOKKOS_RESTRICT b, const int bs0) {
return Impl::SerialTrsvInternalUpper<AlgoType>::invoke(use_unit_diag, false, m, alpha, A, as0, as1, b, bs0);
}
};

} // namespace KokkosBatched

#endif
30 changes: 15 additions & 15 deletions batched/dense/src/KokkosBatched_Trsv_Decl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ struct Trsv {
KOKKOS_INLINE_FUNCTION static int invoke(const MemberType &member, const ScalarType alpha, const AViewType &A,
const bViewType &b) {
int r_val = 0;
if (std::is_same_v<ArgMode, Mode::Serial>) {
if constexpr (std::is_same_v<ArgMode, Mode::Serial>) {
r_val = SerialTrsv<ArgUplo, ArgTrans, ArgDiag, ArgAlgo>::invoke(alpha, A, b);
} else if (std::is_same_v<ArgMode, Mode::Team>) {
} else if constexpr (std::is_same_v<ArgMode, Mode::Team>) {
r_val = TeamTrsv<MemberType, ArgUplo, ArgTrans, ArgDiag, ArgAlgo>::invoke(member, alpha, A, b);
} else if (std::is_same_v<ArgMode, Mode::TeamVector>) {
} else if constexpr (std::is_same_v<ArgMode, Mode::TeamVector>) {
r_val = TeamVectorTrsv<MemberType, ArgUplo, ArgTrans, ArgDiag, ArgAlgo>::invoke(member, alpha, A, b);
}
return r_val;
Expand Down Expand Up @@ -155,46 +155,46 @@ struct Trsv {

#define KOKKOSBATCHED_TRSV_LOWER_NO_TRANSPOSE_INTERNAL_INVOKE(MODETYPE, ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, \
AS1, B, BS) \
if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
KOKKOSBATCHED_SERIAL_TRSV_LOWER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
KOKKOSBATCHED_TEAM_TRSV_LOWER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, \
BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
KOKKOSBATCHED_TEAMVECTOR_TRSV_LOWER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, \
B, BS); \
}

#define KOKKOSBATCHED_TRSV_LOWER_TRANSPOSE_INTERNAL_INVOKE(MODETYPE, ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, \
B, BS) \
if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
KOKKOSBATCHED_SERIAL_TRSV_LOWER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
KOKKOSBATCHED_TEAM_TRSV_LOWER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
KOKKOSBATCHED_TEAMVECTOR_TRSV_LOWER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, \
BS); \
}

#define KOKKOSBATCHED_TRSV_UPPER_NO_TRANSPOSE_INTERNAL_INVOKE(MODETYPE, ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, \
AS1, B, BS) \
if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
KOKKOSBATCHED_SERIAL_TRSV_UPPER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
KOKKOSBATCHED_TEAM_TRSV_UPPER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, \
BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
KOKKOSBATCHED_TEAMVECTOR_TRSV_UPPER_NO_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, \
B, BS); \
}

#define KOKKOSBATCHED_TRSV_UPPER_TRANSPOSE_INTERNAL_INVOKE(MODETYPE, ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, \
B, BS) \
if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Serial>) { \
KOKKOSBATCHED_SERIAL_TRSV_UPPER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::Team>) { \
KOKKOSBATCHED_TEAM_TRSV_UPPER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, BS); \
} else if (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
} else if constexpr (std::is_same_v<MODETYPE, KokkosBatched::Mode::TeamVector>) { \
KOKKOSBATCHED_TEAMVECTOR_TRSV_UPPER_TRANSPOSE_INTERNAL_INVOKE(ALGOTYPE, MEMBER, DIAG, M, N, ALPHA, A, AS0, AS1, B, \
BS); \
}
Expand Down

0 comments on commit 1a0c46b

Please sign in to comment.