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

KokkosKernels: patch in supernodal fix #8674

Merged
merged 2 commits into from
Feb 8, 2021
Merged

KokkosKernels: patch in supernodal fix #8674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07ef9d
KokkosKernels: patch in supernodal fix
brian-kelley Feb 2, 2021
e6eda0b
Fix type consistency
brian-kelley Feb 2, 2021
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
4 changes: 2 additions & 2 deletions packages/kokkos-kernels/src/sparse/KokkosSparse_sptrsv_handle.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ class SPTRSVHandle {
using integer_view_t = Kokkos::View<int*, supercols_memory_space>;
using integer_view_host_t = Kokkos::View<int*, supercols_host_memory_space>;

using workspace_t = typename Kokkos::View<scalar_t*, supercols_memory_space>;
using workspace_t = typename Kokkos::View<scalar_t*, Kokkos::Device<execution_space, supercols_memory_space>>;

//
using host_crsmat_t = KokkosSparse::CrsMatrix<scalar_t, nnz_lno_t, supercols_host_execution_space, void, size_type>;
using crsmat_t = KokkosSparse::CrsMatrix<scalar_t, nnz_lno_t, execution_space, void, size_type>;
using crsmat_t = KokkosSparse::CrsMatrix<scalar_t, nnz_lno_t, Kokkos::Device<execution_space, PersistentMemorySpace>, void, size_type>;

//
using host_graph_t = typename host_crsmat_t::StaticCrsGraphType;
Expand Down
8 changes: 4 additions & 4 deletions packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ struct SparseTriSupernodalSpMVFunctor

using scalar_t = typename LHSType::non_const_value_type;

using work_view_t = typename Kokkos::View<scalar_t*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, Kokkos::Device<execution_space, memory_space>>;

int flag;
long node_count;
Expand Down Expand Up @@ -698,7 +698,7 @@ struct LowerTriSupernodalFunctor
using scalar_t = typename ValuesType::non_const_value_type;

using integer_view_t = Kokkos::View<int*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, Kokkos::Device<execution_space, memory_space>>;

using range_type = Kokkos::pair<int, int>;

Expand Down Expand Up @@ -875,7 +875,7 @@ struct UpperTriSupernodalFunctor
using scalar_t = typename ValuesType::non_const_value_type;

using integer_view_t = Kokkos::View<int*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, Kokkos::Device<execution_space, memory_space>>;

using SupernodeView = typename Kokkos::View<scalar_t**, Kokkos::LayoutLeft,
memory_space, Kokkos::MemoryUnmanaged>;
Expand Down Expand Up @@ -1028,7 +1028,7 @@ struct UpperTriTranSupernodalFunctor
using scalar_t = typename ValuesType::non_const_value_type;

using integer_view_t = Kokkos::View<int*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, memory_space>;
using work_view_t = typename Kokkos::View<scalar_t*, Kokkos::Device<execution_space, memory_space>>;

using range_type = Kokkos::pair<int, int>;

Expand Down