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

Jump to bottom

Axpby bug fix (issue # 2015) #2039

Merged
merged 14 commits into from
Nov 24, 2023
Merged

Axpby bug fix (issue # 2015) #2039

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
af6aeca
Backup
eeprude Nov 20, 2023
5188b71
Backup
eeprude Nov 20, 2023
ee23cf7
Backup
eeprude Nov 20, 2023
931d8b4
Formatting
eeprude Nov 20, 2023
1624ffd
mv_unification tests with double are failing by very small amounts, e…
eeprude Nov 21, 2023
af49d60
Trying one more increment on tolerance
eeprude Nov 21, 2023
091b3ab
Putting pragma's and unrolls properly right before for loops (compila…
eeprude Nov 21, 2023
fc3d24a
Giving it another try to larger tolarance, after fixing the warning o…
eeprude Nov 21, 2023
fbaac45
Another attempt while waiting to get access to the solo cluster
eeprude Nov 22, 2023
9285b6a
Formatting
eeprude Nov 22, 2023
88cec7b
Correction error from the last commit
eeprude Nov 22, 2023
4450d20
Fixing the error that was happening only at the solo cluster
eeprude Nov 23, 2023
9105a8a
Increase tolerance a bit more
eeprude Nov 23, 2023
baab6f5
ncreasing tolerances in all 4 locations
eeprude Nov 23, 2023
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
29 changes: 25 additions & 4 deletions blas/impl/KokkosBlas1_axpby_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ struct Axpby_Functor {
} else if constexpr (scalar_y == 1) {
// Nothing to do: m_y(i) = m_y(i);
} else if constexpr (scalar_y == 2) {
m_y(i) = m_b(0) * m_y(i);
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
m_y(i) =
Kokkos::ArithTraits<typename YV::non_const_value_type>::zero();
} else {
m_y(i) = m_b(0) * m_y(i);
}
}
}
// **************************************************************
Expand All @@ -137,7 +143,12 @@ struct Axpby_Functor {
} else if constexpr (scalar_y == 1) {
m_y(i) = -m_x(i) + m_y(i);
} else if constexpr (scalar_y == 2) {
m_y(i) = -m_x(i) + m_b(0) * m_y(i);
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
m_y(i) = -m_x(i);
} else {
m_y(i) = -m_x(i) + m_b(0) * m_y(i);
}
}
}
// **************************************************************
Expand All @@ -151,7 +162,12 @@ struct Axpby_Functor {
} else if constexpr (scalar_y == 1) {
m_y(i) = m_x(i) + m_y(i);
} else if constexpr (scalar_y == 2) {
m_y(i) = m_x(i) + m_b(0) * m_y(i);
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
m_y(i) = m_x(i);
} else {
m_y(i) = m_x(i) + m_b(0) * m_y(i);
}
}
}
// **************************************************************
Expand All @@ -165,7 +181,12 @@ struct Axpby_Functor {
} else if constexpr (scalar_y == 1) {
m_y(i) = m_a(0) * m_x(i) + m_y(i);
} else if constexpr (scalar_y == 2) {
m_y(i) = m_a(0) * m_x(i) + m_b(0) * m_y(i);
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
m_y(i) = m_a(0) * m_x(i);
} else {
m_y(i) = m_a(0) * m_x(i) + m_b(0) * m_y(i);
}
}
}
}
Expand Down
157 changes: 137 additions & 20 deletions blas/impl/KokkosBlas1_axpby_mv_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,28 @@ struct Axpby_MV_Functor {
// Nothing to do: Y(i,j) := Y(i,j)
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_b(0) * m_y(i, k);
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = Kokkos::ArithTraits<
typename YMV::non_const_value_type>::zero();
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down Expand Up @@ -181,14 +195,27 @@ struct Axpby_MV_Functor {
}
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = -m_x(i, k) + m_b(0) * m_y(i, k);
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = -m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = -m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down Expand Up @@ -239,14 +266,27 @@ struct Axpby_MV_Functor {
}
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_x(i, k) + m_b(0) * m_y(i, k);
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down Expand Up @@ -334,14 +374,27 @@ struct Axpby_MV_Functor {
} else if constexpr (scalar_y == 2) {
if (m_a.extent(0) == 1) {
if (m_b.extent(0) == 1) {
if (m_b(0) == Kokkos::ArithTraits<
typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k) + m_b(0) * m_y(i, k);
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand All @@ -356,14 +409,27 @@ struct Axpby_MV_Functor {
}
} else {
if (m_b.extent(0) == 1) {
if (m_b(0) == Kokkos::ArithTraits<
typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k) + m_b(0) * m_y(i, k);
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
#pragma ivdep
#endif
#ifdef KOKKOS_ENABLE_PRAGMA_VECTOR
#pragma vector always
#endif
for (size_type k = 0; k < numCols; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_IVDEP
Expand Down Expand Up @@ -715,11 +781,22 @@ struct Axpby_MV_Unroll_Functor {
// Nothing to do: Y(i,j) := Y(i,j)
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_b(0) * m_y(i, k);
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = Kokkos::ArithTraits<
typename YMV::non_const_value_type>::zero();
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
Expand Down Expand Up @@ -758,11 +835,21 @@ struct Axpby_MV_Unroll_Functor {
}
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = -m_x(i, k) + m_b(0) * m_y(i, k);
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = -m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = -m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
Expand Down Expand Up @@ -801,11 +888,21 @@ struct Axpby_MV_Unroll_Functor {
}
} else if constexpr (scalar_y == 2) {
if (m_b.extent(0) == 1) {
if (m_b(0) ==
Kokkos::ArithTraits<typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_x(i, k) + m_b(0) * m_y(i, k);
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
Expand Down Expand Up @@ -872,11 +969,21 @@ struct Axpby_MV_Unroll_Functor {
} else if constexpr (scalar_y == 2) {
if (m_a.extent(0) == 1) {
if (m_b.extent(0) == 1) {
if (m_b(0) == Kokkos::ArithTraits<
typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k) + m_b(0) * m_y(i, k);
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(0) * m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
Expand All @@ -888,11 +995,21 @@ struct Axpby_MV_Unroll_Functor {
}
} else {
if (m_b.extent(0) == 1) {
if (m_b(0) == Kokkos::ArithTraits<
typename BV::non_const_value_type>::zero()) {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k) + m_b(0) * m_y(i, k);
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k);
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
#pragma unroll
#endif
for (int k = 0; k < UNROLL; ++k) {
m_y(i, k) = m_a(k) * m_x(i, k) + m_b(0) * m_y(i, k);
}
}
} else {
#ifdef KOKKOS_ENABLE_PRAGMA_UNROLL
Expand Down
Loading