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

Fix issues with distributed preconditioners, add to benchmarks #1660

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

Fix issues with distributed preconditioners, add to benchmarks #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a8facc
[core] create workspace and state in generate
pratikvn Jul 25, 2024
499feb5
[header] schwarz uses initial guess by default
pratikvn Jul 25, 2024
3ee8e1e
[bench] add distributed preconds
pratikvn Aug 5, 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
137 changes: 134 additions & 3 deletions benchmark/utils/preconditioners.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ DEFINE_string(preconditioners, "none",
"A comma-separated list of preconditioners to use. "
"Supported values are: none, jacobi, paric, parict, parilu, "
"parilut, ic, ilu, paric-isai, parict-isai, parilu-isai, "
"parilut-isai, ic-isai, ilu-isai, overhead");
"parilut-isai, ic-isai, ilu-isai, overhead"
#ifdef GINKGO_BUILD_MPI
", schwarz-jacobi, schwarz-ilu, schwarz-ic, schwarz-lu, dist-mg"
#endif
"");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"");
);


DEFINE_uint32(parilu_iterations, 5,
"The number of iterations for ParIC(T)/ParILU(T)");
Expand Down Expand Up @@ -292,12 +296,139 @@ const std::map<std::string, std::function<std::unique_ptr<gko::LinOpFactory>(
.with_sparsity_power(FLAGS_isai_power)
.on(exec);
}},
{"overhead", [](std::shared_ptr<const gko::Executor> exec) {
{"overhead",
[](std::shared_ptr<const gko::Executor> exec) {
return gko::Overhead<etype>::build()
.with_criteria(gko::stop::ResidualNorm<etype>::build()
.with_reduction_factor(rc_etype{}))
.on(exec);
}}};
}}
#ifdef GINKGO_BUILD_MPI
,
{"schwarz-jacobi",
[](std::shared_ptr<const gko::Executor> exec) {
return gko::experimental::distributed::preconditioner::Schwarz<
etype>::build()
.with_local_solver(
gko::preconditioner::Jacobi<etype>::build()
.with_max_block_size(FLAGS_jacobi_max_block_size)
.with_storage_optimization(
parse_storage_optimization(FLAGS_jacobi_storage))
.with_accuracy(
static_cast<rc_etype>(FLAGS_jacobi_accuracy))
.with_skip_sorting(true)
.on(exec))
.on(exec);
}},
{"schwarz-general-isai",
[](std::shared_ptr<const gko::Executor> exec) {
return gko::experimental::distributed::preconditioner::Schwarz<
etype, itype>::build()
.with_local_solver(
gko::preconditioner::GeneralIsai<etype, itype>::build()
.with_sparsity_power(FLAGS_isai_power)
.on(exec))
.on(exec);
}},
{"schwarz-spd-isai",
[](std::shared_ptr<const gko::Executor> exec) {
return gko::experimental::distributed::preconditioner::Schwarz<
etype, itype>::build()
.with_local_solver(
gko::preconditioner::SpdIsai<etype, itype>::build()
.with_sparsity_power(FLAGS_isai_power)
.on(exec))
.on(exec);
}},
{"schwarz-ilu",
[](std::shared_ptr<const gko::Executor> exec) {
auto fact =
gko::share(gko::factorization::Ilu<etype, itype>::build()
.with_skip_sorting(FLAGS_skip_sorting)
.on(exec));
return gko::experimental::distributed::preconditioner::Schwarz<
etype, itype>::build()
.with_local_solver(gko::preconditioner::Ilu<
gko::solver::LowerTrs<etype, itype>,
gko::solver::UpperTrs<etype, itype>,
false, itype>::build()
.with_factorization(fact)
.on(exec))
.on(exec);
}},
{"schwarz-ic",
[](std::shared_ptr<const gko::Executor> exec) {
auto fact =
gko::share(gko::factorization::Ic<etype, itype>::build()
.with_skip_sorting(FLAGS_skip_sorting)
.on(exec));
return gko::experimental::distributed::preconditioner::Schwarz<
etype, itype>::build()
.with_local_solver(
gko::preconditioner::Ic<
gko::solver::LowerTrs<etype, itype>, itype>::build()
.with_factorization(fact)
.on(exec))
.on(exec);
}},
{"schwarz-lu",
[](std::shared_ptr<const gko::Executor> exec) {
auto fact = gko::share(
gko::experimental::factorization::Lu<etype, itype>::build().on(
exec));
return gko::experimental::distributed::preconditioner::Schwarz<
etype, itype>::build()
.with_local_solver(
gko::experimental::solver::Direct<etype, itype>::build()
.with_factorization(fact)
.on(exec))
.on(exec);
}},
{"dist-mg",
[](std::shared_ptr<const gko::Executor> exec) {
using ir = gko::solver::Ir<etype>;
using schwarz =
gko::experimental::distributed::preconditioner::Schwarz<etype,
itype>;
using bj = gko::preconditioner::Jacobi<etype, itype>;
auto iter_stop = gko::share(gko::stop::Iteration::build()
.with_max_iters(FLAGS_mg_max_iters)
.on(exec));
auto tol_stop =
gko::share(gko::stop::ResidualNorm<etype>::build()
.with_baseline(gko::stop::mode::absolute)
.with_reduction_factor(FLAGS_mg_tolerance)
.on(exec));
auto coarsest_solver_gen = gko::share(
ir::build()
.with_solver(schwarz::build().with_local_solver(
bj::build().with_max_block_size(1u).with_skip_sorting(
true)))
.with_relaxation_factor(static_cast<etype>(0.9))
.with_criteria(
gko::stop::Iteration::build().with_max_iters(4u))
.on(exec));
auto pre_smoother = gko::share(
ir::build()
.with_solver(schwarz::build().with_local_solver(
bj::build().with_max_block_size(1u).with_skip_sorting(
true)))
.with_relaxation_factor(static_cast<etype>(0.9))
.with_criteria(
gko::stop::Iteration::build().with_max_iters(1u))
.on(exec));
return gko::solver::Multigrid::build()
.with_mg_level(gko::multigrid::Pgm<etype, itype>::build()
.with_deterministic(FLAGS_mg_deterministic))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these flag are not available yet

.with_criteria(iter_stop, tol_stop)
.with_pre_smoother(pre_smoother)
.with_post_uses_pre(true)
.with_max_levels(FLAGS_mg_num_levels)
.with_coarsest_solver(coarsest_solver_gen)
.on(exec);
}}
#endif
};


#endif // GKO_BENCHMARK_UTILS_PRECONDITIONERS_HPP_
7 changes: 5 additions & 2 deletions core/solver/multigrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,11 @@ void Multigrid::generate()
GKO_ASSERT_EQ(level > 0, true);
auto last_mg_level = mg_level_list_.back();

using ws = workspace_traits<Multigrid>;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused?

this->setup_workspace();
this->create_state();
cache_.state->generate(this->get_system_matrix().get(), this, 1);

// generate coarsest solver
run<gko::multigrid::EnableMultigridLevel, float, double,
std::complex<float>, std::complex<double>>(
Expand Down Expand Up @@ -908,8 +913,6 @@ void Multigrid::apply_dense_impl(const VectorType* b, VectorType* x,
initial_guess_mode guess) const
{
using ws = workspace_traits<Multigrid>;
this->setup_workspace();
this->create_state();
if (cache_.state->nrhs != b->get_size()[1]) {
cache_.state->generate(this->get_system_matrix().get(), this,
b->get_size()[1]);
Expand Down
7 changes: 7 additions & 0 deletions include/ginkgo/core/distributed/preconditioner/schwarz.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ class Schwarz
using local_index_type = LocalIndexType;
using global_index_type = GlobalIndexType;

/**
* Return true as iterative solvers use the data in x as an initial guess.
*
* @return true as iterative solvers use the data in x as an initial guess.
*/
bool apply_uses_initial_guess() const override { return true; }

GKO_CREATE_FACTORY_PARAMETERS(parameters, Factory)
{
/**
Expand Down
Loading