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

Twostage gs streams #2158

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
+274 −167
Open

Twostage gs streams #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ecbc6c
Stream support for Gauss-Seidel: Symbolic, Numeric, Apply (Twostage)
e10harvey Sep 26, 2023
7408367
sparse/unit_test: Test twostage with streams
e10harvey Sep 26, 2023
f4e3df5
Update omega_tsgs_classic type
e10harvey Sep 26, 2023
6f510b3
Move sptrsv to streams
e10harvey Sep 27, 2023
7505956
Add lightweighthint
e10harvey Sep 27, 2023
35b8474
update symbolic check_count
e10harvey Oct 31, 2023
d11fd83
BLAS - Axpby: only print debug info at high debug level
lucbv Mar 28, 2024
923ebf4
Sparse - twostage GS: implementing Brian's review
lucbv Mar 28, 2024
e3e1122
Applying clang-format
lucbv Mar 28, 2024
d52f809
BLAS - Axpby: fixing issue with output level
lucbv Mar 28, 2024
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
2 changes: 1 addition & 1 deletion blas/impl/KokkosBlas1_axpby_unification_attempt_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ struct AxpbyUnificationAttemptTraits {
// ********************************************************************
// Routine to print information on input variables and internal variables
// ********************************************************************
#if (KOKKOSKERNELS_DEBUG_LEVEL > 0)
#if (KOKKOSKERNELS_DEBUG_LEVEL > 1)
static void printInformation(std::ostream& os, std::string const& headerMsg) {
os << headerMsg << ": AV = "
<< typeid(AV).name()
Expand Down
2 changes: 1 addition & 1 deletion blas/src/KokkosBlas1_axpby.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void axpby(const execution_space& exec_space, const AV& a, const XMV& X,
// Perform compile time checks and run time checks.
// **********************************************************************
AxpbyTraits::performChecks(a, X, b, Y);
#if (KOKKOSKERNELS_DEBUG_LEVEL > 0)
#if (KOKKOSKERNELS_DEBUG_LEVEL > 1)
AxpbyTraits::printInformation(std::cout, "axpby(), unif information");
#endif // KOKKOSKERNELS_DEBUG_LEVEL

Expand Down
12 changes: 12 additions & 0 deletions blas/unit_test/Test_Blas1_axpby_unification.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
#include <KokkosBlas1_axpby.hpp>
#include <KokkosKernels_TestUtils.hpp>

#if (KOKKOSKERNELS_DEBUG_LEVEL > 0)
brian-kelley marked this conversation as resolved.
Show resolved Hide resolved
#define KOKKOSKERNELS_DEBUG_LEVEL_OLD KOKKOSKERNELS_DEBUG_LEVEL
#undef KOKKOSKERNELS_DEBUG_LEVEL
#define KOKKOSKERNELS_DEBUG_LEVEL 2
#endif

static constexpr int numVecsAxpbyTest = 15;

namespace Test {
Expand Down Expand Up @@ -2537,6 +2543,12 @@ void impl_test_axpby_mv_unification(int const N, int const K) {

} // namespace Test

#if (KOKKOSKERNELS_DEBUG_LEVEL > 1)
#undef KOKKOSKERNELS_DEBUG_LEVEL
#define KOKKOSKERNELS_DEBUG_LEVEL KOKKOSKERNELS_DEBUG_LEVEL_OLD
#undef KOKKOSKERNELS_DEBUG_LEVEL_OLD
#endif

template <class tScalarA, class tScalarX, class tScalarB, class tScalarY,
class Device>
int test_axpby_unification() {
Expand Down
8 changes: 4 additions & 4 deletions sparse/impl/KokkosSparse_sptrsv_symbolic_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ void lower_tri_symbolic(ExecSpaceIn& space, TriSolveHandle& thandle,
check_count = 0; // reset
Kokkos::parallel_reduce(
"check_count device",
Kokkos::RangePolicy<Kokkos::DefaultExecutionSpace>(
0, dnodes_per_level.extent(0)),
Kokkos::RangePolicy<ExecutionSpace>(space, 0,
dnodes_per_level.extent(0)),
KOKKOS_LAMBDA(const long i, long& update) {
update += dnodes_per_level(i);
},
Expand Down Expand Up @@ -740,8 +740,8 @@ void upper_tri_symbolic(ExecutionSpace& space, TriSolveHandle& thandle,
check_count = 0; // reset
Kokkos::parallel_reduce(
"check_count device",
Kokkos::RangePolicy<Kokkos::DefaultExecutionSpace>(
0, dnodes_per_level.extent(0)),
Kokkos::RangePolicy<ExecutionSpace>(space, 0,
lucbv marked this conversation as resolved.
Show resolved Hide resolved
dnodes_per_level.extent(0)),
KOKKOS_LAMBDA(const long i, long& update) {
update += dnodes_per_level(i);
},
Expand Down
Loading