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

Add unit tests SpMV for BlockCrsMatrix and BsrMatrix #1313

Closed
wants to merge 12 commits into from
Closed

Add unit tests SpMV for BlockCrsMatrix and BsrMatrix #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3084c37
Fix ompilation issues for unit test targetting SpMV with block matrices.
uhetmaniuk Feb 11, 2022
ce28fe6
Fix calls to std::max
uhetmaniuk Feb 14, 2022
a05d8f7
Use explicit integral types.
uhetmaniuk Feb 14, 2022
423f6fa
Fix constructor use for CrsMatrix.
uhetmaniuk Feb 14, 2022
ea26971
Fix template parameter.
uhetmaniuk Feb 14, 2022
d53361d
Fix types
uhetmaniuk Feb 14, 2022
4e7c766
Use constructor with Kokkos::View
uhetmaniuk Feb 14, 2022
f55f8c5
Remove unused variable
uhetmaniuk Feb 15, 2022
f95d3f4
Fix device space when GPU and OpenMP are specified.
uhetmaniuk Feb 16, 2022
2c03b91
Modify the macros
uhetmaniuk Feb 21, 2022
36e2feb
Update macros
uhetmaniuk Feb 21, 2022
b1728ce
Use two tests.
uhetmaniuk Feb 21, 2022
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 src/impl/tpls/KokkosSparse_spmv_bsrmatrix_tpl_spec_decl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ void spmv_block_impl_cusparse(
default: {
std::cerr << "Mode " << mode << " invalid for cusparse[*]bsrmv.\n";
throw std::invalid_argument("Invalid mode");
} break;
}
}

#if (9000 <= CUDA_VERSION)
Expand Down Expand Up @@ -599,7 +599,7 @@ void spm_mv_block_impl_cusparse(
default: {
std::cerr << "Mode " << mode << " invalid for cusparse[*]bsrmv.\n";
throw std::invalid_argument("Invalid mode");
} break;
}
}

int colx = static_cast<int>(x.extent(1));
Expand Down
10 changes: 5 additions & 5 deletions src/sparse/KokkosSparse_spmv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,13 +1007,13 @@ void spmv(KokkosKernels::Experimental::Controls controls, const char mode[],
return spmv(controls, mode, alpha, A_i, x_0, beta, y_0, RANK_ONE());
}
//
return Experimental::Impl::SPMV_MV_BLOCKCRSMATRIX<
typename AMatrix_Internal::value_type,
typename AMatrix_Internal::ordinal_type,
Experimental::Impl::SPMV_MV_BLOCKCRSMATRIX<
typename AMatrix_Internal::const_value_type,
typename AMatrix_Internal::const_ordinal_type,
typename AMatrix_Internal::device_type,
typename AMatrix_Internal::memory_traits,
typename AMatrix_Internal::size_type,
typename XVector_Internal::value_type**,
typename AMatrix_Internal::const_size_type,
typename XVector_Internal::const_value_type**,
typename XVector_Internal::array_layout,
typename XVector_Internal::device_type,
typename XVector_Internal::memory_traits,
Expand Down
4 changes: 2 additions & 2 deletions src/sparse/impl/KokkosSparse_spmv_blockcrsmatrix_spec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ struct spmv_mv_blockcrsmatrix_eti_spec_avail {
const SCALAR_TYPE, const ORDINAL_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged>, const OFFSET_TYPE, \
SCALAR_TYPE const *, LAYOUT_TYPE, \
SCALAR_TYPE const **, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged | Kokkos::RandomAccess>, \
SCALAR_TYPE *, LAYOUT_TYPE, \
SCALAR_TYPE **, LAYOUT_TYPE, \
Kokkos::Device<EXEC_SPACE_TYPE, MEM_SPACE_TYPE>, \
Kokkos::MemoryTraits<Kokkos::Unmanaged> > { \
enum : bool { value = true }; \
Expand Down
4 changes: 2 additions & 2 deletions unit_test/sparse/Test_Sparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "Test_Sparse_spgemm.hpp"
#include "Test_Sparse_spiluk.hpp"
#include "Test_Sparse_spmv.hpp"
//#include "Test_Sparse_spmv_blockcrs.hpp"
//#include "Test_Sparse_spmv_bsr.hpp"
#include "Test_Sparse_spmv_blockcrs.hpp"
#include "Test_Sparse_spmv_bsr.hpp"
#include "Test_Sparse_sptrsv.hpp"
#include "Test_Sparse_trsv.hpp"

Expand Down
Loading