Skip to content

Commit 94a6e1f

Browse files
lucbvlucbv
authored
Stride name fix (kokkos#2634)
* Removing stride_ from blas and sparse Signed-off-by: Luc Berger-Vergiat <[email protected]> * Switching stride_N() for stride(N) Signed-off-by: Luc Berger-Vergiat <[email protected]> * Applying clang-format Signed-off-by: Luc Berger-Vergiat <[email protected]> --------- Signed-off-by: Luc Berger-Vergiat <[email protected]>
1 parent 0cda79a commit 94a6e1f

File tree

49 files changed

+450
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+450
-473
lines changed

‎batched/dense/impl/KokkosBatched_AddRadial_Impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace KokkosBatched {
3030
template <typename ScalarType, typename AViewType>
3131
KOKKOS_INLINE_FUNCTION int SerialAddRadial::invoke(const ScalarType tiny, const AViewType &A) {
3232
return SerialAddRadialInternal::invoke((A.extent(0) < A.extent(1) ? A.extent(0) : A.extent(1)), tiny, A.data(),
33-
(A.stride_0() + A.stride_1()));
33+
(A.stride(0) + A.stride(1)));
3434
}
3535

3636
///
@@ -42,7 +42,7 @@ template <typename ScalarType, typename AViewType>
4242
KOKKOS_INLINE_FUNCTION int TeamAddRadial<MemberType>::invoke(const MemberType &member, const ScalarType tiny,
4343
const AViewType &A) {
4444
return TeamAddRadialInternal::invoke(member, (A.extent(0) < A.extent(1) ? A.extent(0) : A.extent(1)), tiny, A.data(),
45-
(A.stride_0() + A.stride_1()));
45+
(A.stride(0) + A.stride(1)));
4646
}
4747

4848
} // end namespace KokkosBatched

‎batched/dense/impl/KokkosBatched_ApplyQ_Serial_Impl.hpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ KOKKOS_INLINE_FUNCTION int SerialApplyQ<Side::Left, Trans::NoTranspose, Algo::Ap
5454
}
5555
#endif
5656

57-
return SerialApplyQ_LeftForwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride_0(),
58-
A.stride_1(), t.data(), t.stride_0(), B.data(), B.stride_0(),
59-
B.stride_1(), w.data());
57+
return SerialApplyQ_LeftForwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride(0),
58+
A.stride(1), t.data(), t.stride(0), B.data(), B.stride(0),
59+
B.stride(1), w.data());
6060
}
6161

6262
template <>
@@ -86,9 +86,9 @@ KOKKOS_INLINE_FUNCTION int SerialApplyQ<Side::Left, Trans::Transpose, Algo::Appl
8686
}
8787
#endif
8888

89-
return SerialApplyQ_LeftBackwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride_0(),
90-
A.stride_1(), t.data(), t.stride_0(), B.data(), B.stride_0(),
91-
B.stride_1(), w.data());
89+
return SerialApplyQ_LeftBackwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride(0),
90+
A.stride(1), t.data(), t.stride(0), B.data(), B.stride(0),
91+
B.stride(1), w.data());
9292
}
9393

9494
template <>
@@ -118,9 +118,9 @@ KOKKOS_INLINE_FUNCTION int SerialApplyQ<Side::Right, Trans::NoTranspose, Algo::A
118118
}
119119
#endif
120120

121-
return SerialApplyQ_RightForwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride_0(),
122-
A.stride_1(), t.data(), t.stride_0(), B.data(), B.stride_0(),
123-
B.stride_1(), w.data());
121+
return SerialApplyQ_RightForwardInternal::invoke(B.extent(0), B.extent(1), A.extent(1), A.data(), A.stride(0),
122+
A.stride(1), t.data(), t.stride(0), B.data(), B.stride(0),
123+
B.stride(1), w.data());
124124
}
125125

126126
} // namespace KokkosBatched

‎batched/dense/impl/KokkosBatched_ApplyQ_TeamVector_Impl.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ struct TeamVectorApplyQ<MemberType, Side::Left, Trans::NoTranspose, Algo::ApplyQ
4343
size_t B_stride_1 = B_rank == 1 ? 1 : B.stride(1);
4444

4545
return TeamVectorApplyQ_LeftForwardInternal::invoke(member, B.extent(0), B_extent_1, A.extent(1), A.data(),
46-
A.stride_0(), A.stride_1(), t.data(), t.stride_0(), B.data(),
47-
B.stride_0(), B_stride_1, w.data());
46+
A.stride(0), A.stride(1), t.data(), t.stride(0), B.data(),
47+
B.stride(0), B_stride_1, w.data());
4848
}
4949
};
5050

@@ -64,8 +64,8 @@ struct TeamVectorApplyQ<MemberType, Side::Left, Trans::Transpose, Algo::ApplyQ::
6464
size_t B_stride_1 = B_rank == 1 ? 1 : B.stride(1);
6565

6666
return TeamVectorApplyQ_LeftBackwardInternal::invoke(member, B.extent(0), B_extent_1, A.extent(1), A.data(),
67-
A.stride_0(), A.stride_1(), t.data(), t.stride_0(), B.data(),
68-
B.stride_0(), B_stride_1, w.data());
67+
A.stride(0), A.stride(1), t.data(), t.stride(0), B.data(),
68+
B.stride(0), B_stride_1, w.data());
6969
}
7070
};
7171

@@ -85,8 +85,8 @@ struct TeamVectorApplyQ<MemberType, Side::Right, Trans::NoTranspose, Algo::Apply
8585
size_t B_stride_1 = B_rank == 1 ? 1 : B.stride(1);
8686

8787
return TeamVectorApplyQ_RightForwardInternal::invoke(member, B.extent(0), B_extent_1, A.extent(1), A.data(),
88-
A.stride_0(), A.stride_1(), t.data(), t.stride_0(), B.data(),
89-
B.stride_0(), B_stride_1, w.data());
88+
A.stride(0), A.stride(1), t.data(), t.stride(0), B.data(),
89+
B.stride(0), B_stride_1, w.data());
9090
}
9191
};
9292

‎batched/dense/impl/KokkosBatched_Axpy_Impl.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ KOKKOS_INLINE_FUNCTION int SerialAxpy::invoke(const alphaViewType& alpha, const
183183

184184
return SerialAxpyInternal::template invoke<typename alphaViewType::non_const_value_type,
185185
typename XViewType::non_const_value_type>(
186-
X.extent(0), X.extent(1), alpha.data(), alpha.stride_0(), X.data(), X.stride_0(), X.stride_1(), Y.data(),
187-
Y.stride_0(), Y.stride_1());
186+
X.extent(0), X.extent(1), alpha.data(), alpha.stride(0), X.data(), X.stride(0), X.stride(1), Y.data(),
187+
Y.stride(0), Y.stride(1));
188188
}
189189

190190
///
@@ -228,8 +228,8 @@ KOKKOS_INLINE_FUNCTION int TeamAxpy<MemberType>::invoke(const MemberType& member
228228

229229
return TeamAxpyInternal::template invoke<MemberType, typename alphaViewType::non_const_value_type,
230230
typename XViewType::non_const_value_type>(
231-
member, X.extent(0), X.extent(1), alpha.data(), alpha.stride_0(), X.data(), X.stride_0(), X.stride_1(), Y.data(),
232-
Y.stride_0(), Y.stride_1());
231+
member, X.extent(0), X.extent(1), alpha.data(), alpha.stride(0), X.data(), X.stride(0), X.stride(1), Y.data(),
232+
Y.stride(0), Y.stride(1));
233233
}
234234

235235
///
@@ -273,8 +273,8 @@ KOKKOS_INLINE_FUNCTION int TeamVectorAxpy<MemberType>::invoke(const MemberType&
273273

274274
return TeamVectorAxpyInternal::invoke<MemberType, typename alphaViewType::non_const_value_type,
275275
typename XViewType::non_const_value_type, typename XViewType::array_layout>(
276-
member, X.extent(0), X.extent(1), alpha.data(), alpha.stride_0(), X.data(), X.stride_0(), X.stride_1(), Y.data(),
277-
Y.stride_0(), Y.stride_1());
276+
member, X.extent(0), X.extent(1), alpha.data(), alpha.stride(0), X.data(), X.stride(0), X.stride(1), Y.data(),
277+
Y.stride(0), Y.stride(1));
278278
}
279279

280280
} // namespace KokkosBatched

‎batched/dense/impl/KokkosBatched_Copy_Impl.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ namespace KokkosBatched {
3030
template <>
3131
template <typename AViewType, typename BViewType>
3232
KOKKOS_INLINE_FUNCTION int SerialCopy<Trans::NoTranspose, 1>::invoke(const AViewType &A, const BViewType &B) {
33-
return SerialCopyInternal::invoke(A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
33+
return SerialCopyInternal::invoke(A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
3434
}
3535

3636
template <>
3737
template <typename AViewType, typename BViewType>
3838
KOKKOS_INLINE_FUNCTION int SerialCopy<Trans::Transpose, 1>::invoke(const AViewType &A, const BViewType &B) {
39-
return SerialCopyInternal::invoke(A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
39+
return SerialCopyInternal::invoke(A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
4040
}
4141

4242
template <>
@@ -57,8 +57,8 @@ KOKKOS_INLINE_FUNCTION int SerialCopy<Trans::NoTranspose, 2>::invoke(const AView
5757
return 1;
5858
}
5959
#endif
60-
return SerialCopyInternal::invoke(A.extent(0), A.extent(1), A.data(), A.stride_0(), A.stride_1(), B.data(),
61-
B.stride_0(), B.stride_1());
60+
return SerialCopyInternal::invoke(A.extent(0), A.extent(1), A.data(), A.stride(0), A.stride(1), B.data(), B.stride(0),
61+
B.stride(1));
6262
}
6363

6464
template <>
@@ -79,8 +79,8 @@ KOKKOS_INLINE_FUNCTION int SerialCopy<Trans::Transpose, 2>::invoke(const AViewTy
7979
return 1;
8080
}
8181
#endif
82-
return SerialCopyInternal::invoke(A.extent(1), A.extent(0), A.data(), A.stride_1(), A.stride_0(), B.data(),
83-
B.stride_0(), B.stride_1());
82+
return SerialCopyInternal::invoke(A.extent(1), A.extent(0), A.data(), A.stride(1), A.stride(0), B.data(), B.stride(0),
83+
B.stride(1));
8484
}
8585

8686
///
@@ -91,15 +91,15 @@ template <typename MemberType>
9191
struct TeamCopy<MemberType, Trans::NoTranspose, 1> {
9292
template <typename AViewType, typename BViewType>
9393
KOKKOS_INLINE_FUNCTION static int invoke(const MemberType &member, const AViewType &A, const BViewType &B) {
94-
return TeamCopyInternal::invoke(member, A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
94+
return TeamCopyInternal::invoke(member, A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
9595
}
9696
};
9797

9898
template <typename MemberType>
9999
struct TeamCopy<MemberType, Trans::Transpose, 1> {
100100
template <typename AViewType, typename BViewType>
101101
KOKKOS_INLINE_FUNCTION static int invoke(const MemberType &member, const AViewType &A, const BViewType &B) {
102-
return TeamCopyInternal::invoke(member, A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
102+
return TeamCopyInternal::invoke(member, A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
103103
}
104104
};
105105

@@ -127,8 +127,8 @@ struct TeamCopy<MemberType, Trans::NoTranspose, 2> {
127127
return TeamCopy<MemberType, Trans::NoTranspose, 1>::invoke(member, Kokkos::subview(A, 0, Kokkos::ALL),
128128
Kokkos::subview(B, 0, Kokkos::ALL));
129129
}
130-
return TeamCopyInternal::invoke(member, A.extent(0), A.extent(1), A.data(), A.stride_0(), A.stride_1(), B.data(),
131-
B.stride_0(), B.stride_1());
130+
return TeamCopyInternal::invoke(member, A.extent(0), A.extent(1), A.data(), A.stride(0), A.stride(1), B.data(),
131+
B.stride(0), B.stride(1));
132132
}
133133
};
134134

@@ -156,8 +156,8 @@ struct TeamCopy<MemberType, Trans::Transpose, 2> {
156156
return TeamCopy<MemberType, Trans::Transpose, 1>::invoke(member, Kokkos::subview(A, Kokkos::ALL, 0),
157157
Kokkos::subview(B, Kokkos::ALL, 0));
158158
}
159-
return TeamCopyInternal::invoke(member, A.extent(1), A.extent(0), A.data(), A.stride_1(), A.stride_0(), B.data(),
160-
B.stride_0(), B.stride_1());
159+
return TeamCopyInternal::invoke(member, A.extent(1), A.extent(0), A.data(), A.stride(1), A.stride(0), B.data(),
160+
B.stride(0), B.stride(1));
161161
}
162162
};
163163

@@ -169,15 +169,15 @@ template <typename MemberType>
169169
struct TeamVectorCopy<MemberType, Trans::NoTranspose, 1> {
170170
template <typename AViewType, typename BViewType>
171171
KOKKOS_INLINE_FUNCTION static int invoke(const MemberType &member, const AViewType &A, const BViewType &B) {
172-
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
172+
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
173173
}
174174
};
175175

176176
template <typename MemberType>
177177
struct TeamVectorCopy<MemberType, Trans::Transpose, 1> {
178178
template <typename AViewType, typename BViewType>
179179
KOKKOS_INLINE_FUNCTION static int invoke(const MemberType &member, const AViewType &A, const BViewType &B) {
180-
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.data(), A.stride_0(), B.data(), B.stride_0());
180+
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.data(), A.stride(0), B.data(), B.stride(0));
181181
}
182182
};
183183

@@ -205,8 +205,8 @@ struct TeamVectorCopy<MemberType, Trans::NoTranspose, 2> {
205205
return TeamVectorCopy<MemberType, Trans::NoTranspose, 1>::invoke(member, Kokkos::subview(A, 0, Kokkos::ALL),
206206
Kokkos::subview(B, 0, Kokkos::ALL));
207207
}
208-
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.extent(1), A.data(), A.stride_0(), A.stride_1(),
209-
B.data(), B.stride_0(), B.stride_1());
208+
return TeamVectorCopyInternal::invoke(member, A.extent(0), A.extent(1), A.data(), A.stride(0), A.stride(1),
209+
B.data(), B.stride(0), B.stride(1));
210210
}
211211
};
212212

@@ -234,8 +234,8 @@ struct TeamVectorCopy<MemberType, Trans::Transpose, 2> {
234234
return TeamVectorCopy<MemberType, Trans::NoTranspose, 1>::invoke(member, Kokkos::subview(A, Kokkos::ALL, 0),
235235
Kokkos::subview(B, Kokkos::ALL, 0));
236236
}
237-
return TeamVectorCopyInternal::invoke(member, A.extent(1), A.extent(0), A.data(), A.stride_1(), A.stride_0(),
238-
B.data(), B.stride_0(), B.stride_1());
237+
return TeamVectorCopyInternal::invoke(member, A.extent(1), A.extent(0), A.data(), A.stride(1), A.stride(0),
238+
B.data(), B.stride(0), B.stride(1));
239239
}
240240
};
241241

‎batched/dense/impl/KokkosBatched_Dot_Internal.hpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ struct SerialDot<Trans::Transpose> {
190190
#endif
191191
return SerialDotInternal::template invoke<typename XViewType::non_const_value_type,
192192
typename NormViewType::non_const_value_type>(
193-
X.extent(0), X.extent(1), X.data(), X.stride_0(), X.stride_1(), Y.data(), Y.stride_0(), Y.stride_1(),
194-
dot.data(), dot.stride_0());
193+
X.extent(0), X.extent(1), X.data(), X.stride(0), X.stride(1), Y.data(), Y.stride(0), Y.stride(1), dot.data(),
194+
dot.stride(0));
195195
}
196196
};
197197

@@ -225,8 +225,8 @@ struct SerialDot<Trans::NoTranspose> {
225225
#endif
226226
return SerialDotInternal::template invoke<typename XViewType::non_const_value_type,
227227
typename NormViewType::non_const_value_type>(
228-
X.extent(1), X.extent(0), X.data(), X.stride_1(), X.stride_0(), Y.data(), Y.stride_1(), Y.stride_0(),
229-
dot.data(), dot.stride_0());
228+
X.extent(1), X.extent(0), X.data(), X.stride(1), X.stride(0), Y.data(), Y.stride(1), Y.stride(0), dot.data(),
229+
dot.stride(0));
230230
}
231231
};
232232

@@ -273,8 +273,8 @@ struct TeamDot<MemberType, Trans::Transpose> {
273273

274274
return TeamDotInternal::template invoke<MemberType, typename XViewType::non_const_value_type,
275275
typename NormViewType::non_const_value_type>(
276-
member, X.extent(0), X.extent(1), X.data(), X.stride_0(), X.stride_1(), Y.data(), Y.stride_0(), Y.stride_1(),
277-
dot.data(), dot.stride_0());
276+
member, X.extent(0), X.extent(1), X.data(), X.stride(0), X.stride(1), Y.data(), Y.stride(0), Y.stride(1),
277+
dot.data(), dot.stride(0));
278278
}
279279
};
280280

@@ -316,8 +316,8 @@ struct TeamDot<MemberType, Trans::NoTranspose> {
316316

317317
return TeamDotInternal::template invoke<MemberType, typename XViewType::non_const_value_type,
318318
typename NormViewType::non_const_value_type>(
319-
member, X.extent(1), X.extent(0), X.data(), X.stride_1(), X.stride_0(), Y.data(), Y.stride_1(), Y.stride_0(),
320-
dot.data(), dot.stride_0());
319+
member, X.extent(1), X.extent(0), X.data(), X.stride(1), X.stride(0), Y.data(), Y.stride(1), Y.stride(0),
320+
dot.data(), dot.stride(0));
321321
}
322322
};
323323

@@ -364,8 +364,8 @@ struct TeamVectorDot<MemberType, Trans::Transpose> {
364364

365365
return TeamVectorDotInternal::template invoke<MemberType, typename XViewType::non_const_value_type,
366366
typename NormViewType::non_const_value_type>(
367-
member, X.extent(0), X.extent(1), X.data(), X.stride_0(), X.stride_1(), Y.data(), Y.stride_0(), Y.stride_1(),
368-
dot.data(), dot.stride_0());
367+
member, X.extent(0), X.extent(1), X.data(), X.stride(0), X.stride(1), Y.data(), Y.stride(0), Y.stride(1),
368+
dot.data(), dot.stride(0));
369369
}
370370
};
371371

@@ -407,8 +407,8 @@ struct TeamVectorDot<MemberType, Trans::NoTranspose> {
407407

408408
return TeamVectorDotInternal::template invoke<MemberType, typename XViewType::non_const_value_type,
409409
typename NormViewType::non_const_value_type>(
410-
member, X.extent(1), X.extent(0), X.data(), X.stride_1(), X.stride_0(), Y.data(), Y.stride_1(), Y.stride_0(),
411-
dot.data(), dot.stride_0());
410+
member, X.extent(1), X.extent(0), X.data(), X.stride(1), X.stride(0), Y.data(), Y.stride(1), Y.stride(0),
411+
dot.data(), dot.stride(0));
412412
}
413413
};
414414

‎batched/dense/impl/KokkosBatched_Gbtrs_Serial_Internal.hpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,8 @@ KOKKOS_INLINE_FUNCTION int SerialGbtrsInternal<Trans::Transpose, Algo::Gbtrs::Un
8686
auto x = Kokkos::subview(A, Kokkos::pair(kd, kd + lm), j);
8787
auto y = Kokkos::subview(b, Kokkos::pair(j, j + lm));
8888

89-
KokkosBlas::Impl::SerialGemvInternal<Algo::Gemv::Unblocked>::invoke(1, a.extent(0), -1.0, a.data(), a.stride_0(),
90-
a.stride_0(), x.data(), x.stride_0(), 1.0,
91-
y.data(), y.stride_0());
89+
KokkosBlas::Impl::SerialGemvInternal<Algo::Gemv::Unblocked>::invoke(
90+
1, a.extent(0), -1.0, a.data(), a.stride(0), a.stride(0), x.data(), x.stride(0), 1.0, y.data(), y.stride(0));
9291

9392
// If pivot index is not j, swap rows l and j in b
9493
auto l = piv(j);
@@ -125,8 +124,8 @@ KOKKOS_INLINE_FUNCTION int SerialGbtrsInternal<Trans::ConjTranspose, Algo::Gbtrs
125124

126125
SerialLacgv::invoke(b_j);
127126
KokkosBlas::Impl::SerialGemvInternal<Algo::Gemv::Unblocked>::invoke(
128-
KokkosBlas::Impl::OpConj(), 1, a.extent(0), -1.0, a.data(), a.stride_0(), a.stride_0(), x.data(),
129-
x.stride_0(), 1.0, y.data(), y.stride_0());
127+
KokkosBlas::Impl::OpConj(), 1, a.extent(0), -1.0, a.data(), a.stride(0), a.stride(0), x.data(), x.stride(0),
128+
1.0, y.data(), y.stride(0));
130129
SerialLacgv::invoke(b_j);
131130

132131
// If pivot index is not j, swap rows l and j in b

0 commit comments

Comments
 (0)