Skip to content

Commit c93b6dc

Browse files
authored
Bigger sptrsv cleanup (kokkos#2280)
* Some cleanup and refactoring * Remove Upper/Lower TriLvlSchedTP2SolverFunctors * Remove Upper/Lower single block functors * Remove unused TriLvlSchedTP1SingleBlockFunctorDiagValues and merge upper/lower tri_solve_cg * Merge two big upper/lower branch of tri_solve_chain * Merge upper/lower tri_solve_streams * Switch over block spiluk precond test to use new block sptrsv
1 parent 3ce7adb commit c93b6dc

File tree

4 files changed

+585
-2656
lines changed

4 files changed

+585
-2656
lines changed

sparse/impl/KokkosSparse_sptrsv_cuSPARSE_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ void sptrsvcuSPARSE_solve(ExecutionSpace &space, KernelHandle *sptrsv_handle,
305305
#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE
306306
#if (CUDA_VERSION >= 11030)
307307
typedef typename KernelHandle::nnz_lno_t idx_type;
308-
typedef typename KernelHandle::size_type size_type;
309308
typedef typename KernelHandle::scalar_t scalar_type;
310309
typedef typename KernelHandle::memory_space memory_space;
311310

@@ -474,7 +473,6 @@ void sptrsvcuSPARSE_solve_streams(
474473
) {
475474
#ifdef KOKKOSKERNELS_ENABLE_TPL_CUSPARSE
476475
using idx_type = typename KernelHandle::nnz_lno_t;
477-
using size_type = typename KernelHandle::size_type;
478476
using scalar_type = typename KernelHandle::nnz_scalar_t;
479477
using memory_space = typename KernelHandle::HandlePersistentMemorySpace;
480478
using sptrsvHandleType = typename KernelHandle::SPTRSVHandleType;
@@ -544,6 +542,8 @@ void sptrsvcuSPARSE_solve_streams(
544542
}
545543
}
546544
#else // CUDA_VERSION < 11030
545+
using size_type = typename KernelHandle::size_type;
546+
547547
const bool is_cuda_space =
548548
std::is_same<memory_space, Kokkos::CudaSpace>::value ||
549549
std::is_same<memory_space, Kokkos::CudaUVMSpace>::value ||

0 commit comments

Comments
 (0)