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

Jump to bottom

Naive lower triangular solver + updated cuSPARSE solvers #764

Merged
merged 15 commits into from
Dec 14, 2021
Merged

Naive lower triangular solver + updated cuSPARSE solvers #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e622c25
Add naive lower triangular solver
lksriemer May 7, 2021
60eb661
Review updates
lksriemer May 7, 2021
ed1962d
Add fallback sptrsv kernel
lksriemer Jun 4, 2021
a58b250
Shrink trisolve block size for fallback
lksriemer Jun 7, 2021
a672512
Add NaN optimization to sptrsv
lksriemer Jul 11, 2021
009fb32
Add CUDA generic API triangular solver
upsj Aug 26, 2021
5f60339
use custom implementation for upper_trs
upsj Aug 27, 2021
905c383
pass different vectors to trisolve analysis
upsj Oct 19, 2021
bee6006
add support for multiple RHS to custom trisolve
upsj Oct 19, 2021
ccd0dea
fix potential threadblock-level deadlock
upsj Nov 3, 2021
420d6db
Review updates
lksriemer Nov 14, 2021
73c45ad
Review updates
lksriemer Dec 9, 2021
97a2a17
fix circular dependency
upsj Dec 10, 2021
4a4bff9
avoid testing buggy cuSPARSE behavior
upsj Dec 11, 2021
3916a4b
complete sptrsv dpcpp stub
lksriemer Dec 14, 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
2 changes: 0 additions & 2 deletions core/device_hooks/common_kernels.inc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ namespace lower_trs {


GKO_STUB(GKO_DECLARE_LOWER_TRS_SHOULD_PERFORM_TRANSPOSE_KERNEL);
GKO_STUB(GKO_DECLARE_LOWER_TRS_INIT_STRUCT_KERNEL);
GKO_STUB_VALUE_AND_INDEX_TYPE(GKO_DECLARE_LOWER_TRS_GENERATE_KERNEL);
GKO_STUB_VALUE_AND_INDEX_TYPE(GKO_DECLARE_LOWER_TRS_SOLVE_KERNEL);

Expand All @@ -330,7 +329,6 @@ namespace upper_trs {


GKO_STUB(GKO_DECLARE_UPPER_TRS_SHOULD_PERFORM_TRANSPOSE_KERNEL);
GKO_STUB(GKO_DECLARE_UPPER_TRS_INIT_STRUCT_KERNEL);
GKO_STUB_VALUE_AND_INDEX_TYPE(GKO_DECLARE_UPPER_TRS_GENERATE_KERNEL);
GKO_STUB_VALUE_AND_INDEX_TYPE(GKO_DECLARE_UPPER_TRS_SOLVE_KERNEL);

Expand Down
11 changes: 1 addition & 10 deletions core/solver/lower_trs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ namespace {


GKO_REGISTER_OPERATION(generate, lower_trs::generate);
GKO_REGISTER_OPERATION(init_struct, lower_trs::init_struct);
GKO_REGISTER_OPERATION(should_perform_transpose,
lower_trs::should_perform_transpose);
GKO_REGISTER_OPERATION(solve, lower_trs::solve);
Expand Down Expand Up @@ -85,19 +84,11 @@ std::unique_ptr<LinOp> LowerTrs<ValueType, IndexType>::conj_transpose() const
}


template <typename ValueType, typename IndexType>
void LowerTrs<ValueType, IndexType>::init_trs_solve_struct()
{
this->get_executor()->run(lower_trs::make_init_struct(this->solve_struct_));
}


template <typename ValueType, typename IndexType>
void LowerTrs<ValueType, IndexType>::generate()
{
this->get_executor()->run(lower_trs::make_generate(
gko::lend(system_matrix_), gko::lend(this->solve_struct_),
parameters_.num_rhs));
gko::lend(system_matrix_), this->solve_struct_, parameters_.num_rhs));
}


Expand Down
14 changes: 4 additions & 10 deletions core/solver/lower_trs_kernels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,10 @@ namespace lower_trs {
bool& do_transpose)


#define GKO_DECLARE_LOWER_TRS_INIT_STRUCT_KERNEL \
void init_struct(std::shared_ptr<const DefaultExecutor> exec, \
std::shared_ptr<solver::SolveStruct>& solve_struct)


#define GKO_DECLARE_LOWER_TRS_GENERATE_KERNEL(_vtype, _itype) \
void generate(std::shared_ptr<const DefaultExecutor> exec, \
const matrix::Csr<_vtype, _itype>* matrix, \
solver::SolveStruct* solve_struct, \
#define GKO_DECLARE_LOWER_TRS_GENERATE_KERNEL(_vtype, _itype) \
void generate(std::shared_ptr<const DefaultExecutor> exec, \
const matrix::Csr<_vtype, _itype>* matrix, \
std::shared_ptr<solver::SolveStruct>& solve_struct, \
const gko::size_type num_rhs)


Expand All @@ -80,7 +75,6 @@ namespace lower_trs {

#define GKO_DECLARE_ALL_AS_TEMPLATES \
GKO_DECLARE_LOWER_TRS_SHOULD_PERFORM_TRANSPOSE_KERNEL; \
GKO_DECLARE_LOWER_TRS_INIT_STRUCT_KERNEL; \
template <typename ValueType, typename IndexType> \
GKO_DECLARE_LOWER_TRS_SOLVE_KERNEL(ValueType, IndexType); \
template <typename ValueType, typename IndexType> \
Expand Down
11 changes: 1 addition & 10 deletions core/solver/upper_trs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ namespace {


GKO_REGISTER_OPERATION(generate, upper_trs::generate);
GKO_REGISTER_OPERATION(init_struct, upper_trs::init_struct);
GKO_REGISTER_OPERATION(should_perform_transpose,
upper_trs::should_perform_transpose);
GKO_REGISTER_OPERATION(solve, upper_trs::solve);
Expand Down Expand Up @@ -85,19 +84,11 @@ std::unique_ptr<LinOp> UpperTrs<ValueType, IndexType>::conj_transpose() const
}


template <typename ValueType, typename IndexType>
void UpperTrs<ValueType, IndexType>::init_trs_solve_struct()
{
this->get_executor()->run(upper_trs::make_init_struct(this->solve_struct_));
}


template <typename ValueType, typename IndexType>
void UpperTrs<ValueType, IndexType>::generate()
{
this->get_executor()->run(upper_trs::make_generate(
gko::lend(system_matrix_), gko::lend(this->solve_struct_),
parameters_.num_rhs));
gko::lend(system_matrix_), this->solve_struct_, parameters_.num_rhs));
}


Expand Down
14 changes: 4 additions & 10 deletions core/solver/upper_trs_kernels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,10 @@ namespace upper_trs {
bool& do_transpose)


#define GKO_DECLARE_UPPER_TRS_INIT_STRUCT_KERNEL \
void init_struct(std::shared_ptr<const DefaultExecutor> exec, \
std::shared_ptr<gko::solver::SolveStruct>& solve_struct)


#define GKO_DECLARE_UPPER_TRS_GENERATE_KERNEL(_vtype, _itype) \
void generate(std::shared_ptr<const DefaultExecutor> exec, \
const matrix::Csr<_vtype, _itype>* matrix, \
solver::SolveStruct* solve_struct, \
#define GKO_DECLARE_UPPER_TRS_GENERATE_KERNEL(_vtype, _itype) \
void generate(std::shared_ptr<const DefaultExecutor> exec, \
const matrix::Csr<_vtype, _itype>* matrix, \
std::shared_ptr<gko::solver::SolveStruct>& solve_struct, \
const gko::size_type num_rhs)


Expand All @@ -80,7 +75,6 @@ namespace upper_trs {

#define GKO_DECLARE_ALL_AS_TEMPLATES \
GKO_DECLARE_UPPER_TRS_SHOULD_PERFORM_TRANSPOSE_KERNEL; \
GKO_DECLARE_UPPER_TRS_INIT_STRUCT_KERNEL; \
template <typename ValueType, typename IndexType> \
GKO_DECLARE_UPPER_TRS_SOLVE_KERNEL(ValueType, IndexType); \
template <typename ValueType, typename IndexType> \
Expand Down
Loading