Skip to content

Commit 6c71d46

Browse files
cwpearsoncwpearson
committed
deprecate __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__
In favor of KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED. Signed-off-by: Carl Pearson <cwpears@sandia.gov>
1 parent d343008 commit 6c71d46

6 files changed

+51
-17
lines changed

‎batched/KokkosBatched_Util.hpp

+19-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,25 @@
9191
#endif
9292
#define __KOKKOSBATCHED_ENABLE_INTEL_MKL_BATCHED__ KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED
9393

94-
#define __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ 1
94+
#define KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED 1
95+
#if defined(KOKKOS_COMPILER_MSVC)
96+
#define __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ \
97+
( \
98+
__pragma(message("warning: __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ is deprecated and will be " \
99+
"removed in a future version")) KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
100+
#elif defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG)
101+
#define __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ \
102+
(__extension__({ \
103+
_Pragma( \
104+
"\"__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ is deprecated and will be removed in a future " \
105+
"version\""); \
106+
KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED; \
107+
}))
108+
#else
109+
#define __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ \
110+
KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED // no good way to deprecate?
111+
#endif
112+
95113
#include "mkl.h"
96114
// #include "mkl_types.h"
97115
#endif

‎batched/dense/impl/KokkosBatched_Gemm_Serial_Impl.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ KOKKOS_INLINE_FUNCTION static int checkGemmInput([[maybe_unused]] const AViewTyp
8585
///
8686

8787
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
88-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
88+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
8989
template <>
9090
template <typename ScalarType, typename AViewType, typename BViewType, typename CViewType>
9191
KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::NoTranspose, Trans::NoTranspose, Algo::Gemm::CompactMKL>::invoke(
@@ -158,7 +158,7 @@ KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::NoTranspose, Trans::NoTranspose, Al
158158
///
159159

160160
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
161-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
161+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
162162
template <>
163163
template <typename ScalarType, typename AViewType, typename BViewType, typename CViewType>
164164
KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::Transpose, Trans::NoTranspose, Algo::Gemm::CompactMKL>::invoke(
@@ -304,7 +304,7 @@ KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::ConjTranspose, Trans::NoTranspose,
304304
///
305305

306306
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
307-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
307+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
308308
template <>
309309
template <typename ScalarType, typename AViewType, typename BViewType, typename CViewType>
310310
KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::NoTranspose, Trans::Transpose, Algo::Gemm::CompactMKL>::invoke(
@@ -377,7 +377,7 @@ KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::NoTranspose, Trans::Transpose, Algo
377377
///
378378

379379
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
380-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
380+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
381381
template <>
382382
template <typename ScalarType, typename AViewType, typename BViewType, typename CViewType>
383383
KOKKOS_INLINE_FUNCTION int SerialGemm<Trans::Transpose, Trans::Transpose, Algo::Gemm::CompactMKL>::invoke(

‎batched/dense/impl/KokkosBatched_LU_Serial_Impl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace KokkosBatched {
3232
///
3333

3434
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
35-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
35+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
3636
template <>
3737
template <typename AViewType>
3838
KOKKOS_INLINE_FUNCTION int SerialLU<Algo::LU::CompactMKL>::invoke(

‎batched/dense/impl/KokkosBatched_Trsm_Serial_Impl.hpp

+20-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ KOKKOS_INLINE_FUNCTION static int checkTrsmInput([[maybe_unused]] const AViewTyp
5656
/// A(m x m), B(m x n)
5757

5858
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
59-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
59+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
6060
template <typename ArgDiag>
6161
struct SerialTrsm<Side::Left, Uplo::Lower, Trans::NoTranspose, ArgDiag, Algo::Trsm::CompactMKL> {
6262
template <typename ScalarType, typename AViewType, typename BViewType>
@@ -112,8 +112,24 @@ struct SerialTrsm<Side::Left, Uplo::Lower, Trans::NoTranspose, ArgDiag, Algo::Tr
112112
// Quick return if possible
113113
if (B.extent(0) == 0 || B.extent(1) == 0) return 0;
114114

115+
<<<<<<< HEAD
115116
auto info = KokkosBatched::Impl::checkTrsmInput<Side::Left>(A, B);
116117
if (info) return info;
118+
=======
119+
///
120+
/// R/U/NT
121+
///
122+
/// B := (alpha*B) inv(triu(A))
123+
/// A(n x n), B(m x n)
124+
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
125+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
126+
template <typename ArgDiag>
127+
struct SerialTrsm<Side::Right, Uplo::Upper, Trans::NoTranspose, ArgDiag, Algo::Trsm::CompactMKL> {
128+
template <typename ScalarType, typename AViewType, typename BViewType>
129+
KOKKOS_INLINE_FUNCTION static int invoke(const ScalarType alpha, const AViewType &A, const BViewType &B) {
130+
typedef typename BViewType::value_type vector_type;
131+
// typedef typename vector_type::value_type value_type;
132+
>>>>>>> 20b927f3e (deprecate __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
117133

118134
return KokkosBatched::Impl::SerialTrsmInternalLeftLower<Algo::Trsm::Blocked>::invoke(
119135
ArgDiag::use_unit_diag, false, B.extent(0), B.extent(1), alpha, A.data(), A.stride_0(), A.stride_1(), B.data(),
@@ -127,7 +143,7 @@ struct SerialTrsm<Side::Left, Uplo::Lower, Trans::NoTranspose, ArgDiag, Algo::Tr
127143
/// B := inv(triu(A)) (alpha*B)
128144
/// A(m x m), B(m x n)
129145
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
130-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
146+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
131147
template <typename ArgDiag>
132148
struct SerialTrsm<Side::Left, Uplo::Upper, Trans::NoTranspose, ArgDiag, Algo::Trsm::CompactMKL> {
133149
template <typename ScalarType, typename AViewType, typename BViewType>
@@ -199,7 +215,7 @@ struct SerialTrsm<Side::Left, Uplo::Upper, Trans::NoTranspose, ArgDiag, Algo::Tr
199215
/// A(m x m), B(m x n)
200216

201217
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
202-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
218+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
203219
template <typename ArgDiag>
204220
struct SerialTrsm<Side::Left, Uplo::Lower, Trans::Transpose, ArgDiag, Algo::Trsm::CompactMKL> {
205221
template <typename ScalarType, typename AViewType, typename BViewType>
@@ -270,7 +286,7 @@ struct SerialTrsm<Side::Left, Uplo::Lower, Trans::Transpose, ArgDiag, Algo::Trsm
270286
/// B := inv(triu(AT)) (alpha*B)
271287
/// A(m x m), B(m x n)
272288
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
273-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
289+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
274290
template <typename ArgDiag>
275291
struct SerialTrsm<Side::Left, Uplo::Upper, Trans::Transpose, ArgDiag, Algo::Trsm::CompactMKL> {
276292
template <typename ScalarType, typename AViewType, typename BViewType>

‎batched/dense/impl/KokkosBatched_Trsv_Serial_Impl.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ KOKKOS_INLINE_FUNCTION static int checkTrsvInput([[maybe_unused]] const AViewTyp
6868

6969
//// Lower non-transpose ////
7070
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
71-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
71+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
7272
template <typename ArgDiag>
7373
struct SerialTrsv<Uplo::Lower, Trans::NoTranspose, ArgDiag, Algo::Trsv::CompactMKL> {
7474
template <typename ScalarType, typename AViewType, typename bViewType>
@@ -141,7 +141,7 @@ struct SerialTrsv<Uplo::Lower, Trans::NoTranspose, ArgDiag, Algo::Trsv::Blocked>
141141

142142
//// Lower transpose ////
143143
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
144-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
144+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
145145
template <typename ArgDiag>
146146
struct SerialTrsv<Uplo::Lower, Trans::Transpose, ArgDiag, Algo::Trsv::CompactMKL> {
147147
template <typename ScalarType, typename AViewType, typename bViewType>
@@ -285,7 +285,7 @@ struct SerialTrsv<Uplo::Lower, Trans::ConjTranspose, ArgDiag, Algo::Trsv::Blocke
285285

286286
//// Upper non-transpose ////
287287
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
288-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
288+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
289289
template <typename ArgDiag>
290290
struct SerialTrsv<Uplo::Upper, Trans::NoTranspose, ArgDiag, Algo::Trsv::CompactMKL> {
291291
template <typename ScalarType, typename AViewType, typename bViewType>
@@ -358,7 +358,7 @@ struct SerialTrsv<Uplo::Upper, Trans::NoTranspose, ArgDiag, Algo::Trsv::Blocked>
358358

359359
//// Upper transpose ////
360360
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
361-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
361+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
362362
template <typename ArgDiag>
363363
struct SerialTrsv<Uplo::Upper, Trans::Transpose, ArgDiag, Algo::Trsv::CompactMKL> {
364364
template <typename ScalarType, typename AViewType, typename bViewType>

‎perf_test/blas/blas3/KokkosBlas3_gemm_perf_test.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1976,7 +1976,7 @@ void do_gemm_serial_simd_batched_blocked_parallel(options_t options) {
19761976
}
19771977

19781978
#if defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL) && defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED) && \
1979-
defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
1979+
defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
19801980
void do_gemm_serial_batched_compact_mkl_parallel(options_t options) {
19811981
STATUS;
19821982
if (options.blas_args.batch_size_last_dim)
@@ -1999,9 +1999,9 @@ void do_gemm_serial_batched_compact_mkl_parallel(options_t) {
19991999
<< " disabled since KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_BATCHED is "
20002000
"undefined."
20012001
<< std::endl;
2002-
#elif !defined(__KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__)
2002+
#elif !defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED)
20032003
std::cerr << std::string(__func__)
2004-
<< " disabled since __KOKKOSBATCHED_ENABLE_INTEL_MKL_COMPACT_BATCHED__ "
2004+
<< " disabled since KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL_COMPACT_BATCHED "
20052005
"is undefined."
20062006
<< std::endl;
20072007
#endif

0 commit comments

Comments
 (0)