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

Sparse - sptrsv: implementing generic tpl layer for sptrsv #2201

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Sparse - sptrsv: implementing generic tpl layer for sptrsv #2201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e83212c
Sparse - sptrsv: implementing generic tpl layer for sptrsv
lucbv Mar 21, 2024
0f18aeb
Sparse - SpTRSV: fix for cusparse < 110300
lucbv May 9, 2024
07d9261
Sparse - sptrsv: final fixes
lucbv May 21, 2024
0bc8b1a
Sparse - SpTRSV: applying clang-format
lucbv May 22, 2024
aad73ca
Sparse - SpTRSV: addressing Vinh's comments
lucbv May 22, 2024
4232c50
Sparse - SpTRSV: adding CudaUVMSpace to tpl_spec_avail
lucbv May 23, 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
3 changes: 2 additions & 1 deletion sparse/impl/KokkosSparse_crs_to_bsr_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ template <typename Bsr, typename Crs>
Bsr blocked_crs_to_bsr(const Crs &crs, size_t blockSize) {
using bsr_value_type = typename Bsr::value_type;
using bsr_ordinal_type = typename Bsr::ordinal_type;
using csr_size_type = typename Crs::non_const_size_type;

// copy matrix data to host
auto hRowMap = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(),
Expand All @@ -119,7 +120,7 @@ Bsr blocked_crs_to_bsr(const Crs &crs, size_t blockSize) {

for (bsr_ordinal_type row = 0; row < bsr_ordinal_type(hRowMap.size()) - 1;
++row) {
for (size_t ci = hRowMap(row); ci < hRowMap(row + 1); ++ci) {
for (csr_size_type ci = hRowMap(row); ci < hRowMap(row + 1); ++ci) {
bsr_ordinal_type col = hColInds(ci);
bsr_value_type val = hVals(ci);

Expand Down
22 changes: 16 additions & 6 deletions sparse/impl/KokkosSparse_sptrsv_symbolic_spec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,29 @@ namespace Impl {
/// \brief Implementation of KokkosSparse::sptrsv_symbolic

template <class ExecutionSpace, class KernelHandle, class RowMapType,
class EntriesType,
class EntriesType, class ValuesType,
bool tpl_spec_avail = sptrsv_symbolic_tpl_spec_avail<
KernelHandle, RowMapType, EntriesType>::value,
KernelHandle, RowMapType, EntriesType, ValuesType>::value,
bool eti_spec_avail = sptrsv_symbolic_eti_spec_avail<
KernelHandle, RowMapType, EntriesType>::value>
struct SPTRSV_SYMBOLIC {
static void sptrsv_symbolic(const ExecutionSpace &space, KernelHandle *handle,
const RowMapType row_map,
const EntriesType entries);
const EntriesType entries,
const ValuesType values);
};

#if !defined(KOKKOSKERNELS_ETI_ONLY) || KOKKOSKERNELS_IMPL_COMPILE_LIBRARY
//! Full specialization of sptrsv_symbolic
// Unification layer
template <class ExecutionSpace, class KernelHandle, class RowMapType,
class EntriesType>
class EntriesType, class ValuesType>
struct SPTRSV_SYMBOLIC<ExecutionSpace, KernelHandle, RowMapType, EntriesType,
false, KOKKOSKERNELS_IMPL_COMPILE_LIBRARY> {
ValuesType, false, KOKKOSKERNELS_IMPL_COMPILE_LIBRARY> {
static void sptrsv_symbolic(const ExecutionSpace &space, KernelHandle *handle,
const RowMapType row_map,
const EntriesType entries) {
const EntriesType entries,
const ValuesType /*values*/) {
auto sptrsv_handle = handle->get_sptrsv_handle();
auto nrows = row_map.extent(0) - 1;
sptrsv_handle->new_init_handle(nrows);
Expand Down Expand Up @@ -129,6 +131,10 @@ struct SPTRSV_SYMBOLIC<ExecutionSpace, KernelHandle, RowMapType, EntriesType,
const ORDINAL_TYPE *, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess> >, \
Kokkos::View< \
const SCALAR_TYPE *, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess> >, \
false, true>;

#define KOKKOSSPARSE_SPTRSV_SYMBOLIC_ETI_SPEC_INST( \
Expand All @@ -147,6 +153,10 @@ struct SPTRSV_SYMBOLIC<ExecutionSpace, KernelHandle, RowMapType, EntriesType,
const ORDINAL_TYPE *, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess> >, \
Kokkos::View< \
const SCALAR_TYPE *, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess> >, \
false, true>;

#include <KokkosSparse_sptrsv_symbolic_tpl_spec_decl.hpp>
Expand Down
Loading
Loading