From e07ef9d8feeee9fc116e1bb6548186017da6b938 Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Tue, 2 Feb 2021 09:29:17 -0700
Subject: [PATCH 1/2] KokkosKernels: patch in supernodal fix

---
 .../src/sparse/KokkosSparse_sptrsv_handle.hpp               | 4 ++--
 .../src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kokkos-kernels/src/sparse/KokkosSparse_sptrsv_handle.hpp b/packages/kokkos-kernels/src/sparse/KokkosSparse_sptrsv_handle.hpp
index b235743306b0..7fa8d4e4ffa4 100644
--- a/packages/kokkos-kernels/src/sparse/KokkosSparse_sptrsv_handle.hpp
+++ b/packages/kokkos-kernels/src/sparse/KokkosSparse_sptrsv_handle.hpp
@@ -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;
diff --git a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
index 271d8b23966a..f7f3cc5bf58b 100644
--- a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
+++ b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
@@ -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;
@@ -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>;
 
@@ -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>;

From e6eda0b492f21fabcc7b91f2b306c88f26e89f4b Mon Sep 17 00:00:00 2001
From: Brian Kelley <bmkelle@sandia.gov>
Date: Tue, 2 Feb 2021 14:20:47 -0700
Subject: [PATCH 2/2] Fix type consistency

in an sptrsv supernodal functor. Mirror of KK PR #885
---
 .../src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
index f7f3cc5bf58b..1f8164a3b0d0 100644
--- a/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
+++ b/packages/kokkos-kernels/src/sparse/impl/KokkosSparse_sptrsv_solve_impl.hpp
@@ -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>;