From a815e1f70cc9d9dfd45f6069df6557976add8fc3 Mon Sep 17 00:00:00 2001 From: "Yu-Hsiang M. Tsai" Date: Fri, 17 May 2024 09:14:25 +0200 Subject: [PATCH] update doc, rename Co-authored-by: Marcel Koch --- core/solver/multigrid.cpp | 22 +++++++++++----------- include/ginkgo/core/multigrid/pgm.hpp | 2 +- include/ginkgo/core/solver/multigrid.hpp | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/solver/multigrid.cpp b/core/solver/multigrid.cpp index 02850fb4a8b..0fdfeaca6ad 100644 --- a/core/solver/multigrid.cpp +++ b/core/solver/multigrid.cpp @@ -6,6 +6,7 @@ #include +#include #include @@ -29,7 +30,6 @@ #include "core/base/dispatch_helper.hpp" #include "core/components/fill_array_kernels.hpp" -#include "core/config/config.hpp" #include "core/config/config_helper.hpp" #include "core/distributed/helpers.hpp" #include "core/solver/ir_kernels.hpp" @@ -579,28 +579,28 @@ typename Multigrid::parameters_type Multigrid::parse( if (auto& obj = config.get("criteria")) { factory.with_criteria( - gko::config::get_factory_vector( + config::parse_or_get_factory_vector( obj, context, td_for_child)); } if (auto& obj = config.get("mg_level")) { factory.with_mg_level( - gko::config::get_factory_vector( + config::parse_or_get_factory_vector( obj, context, td_for_child)); } if (auto& obj = config.get("pre_smoother")) { factory.with_pre_smoother( - gko::config::get_factory_vector(obj, context, - td_for_child)); + config::parse_or_get_factory_vector( + obj, context, td_for_child)); } if (auto& obj = config.get("post_smoother")) { factory.with_post_smoother( - gko::config::get_factory_vector(obj, context, - td_for_child)); + config::parse_or_get_factory_vector( + obj, context, td_for_child)); } if (auto& obj = config.get("mid_smoother")) { factory.with_mid_smoother( - gko::config::get_factory_vector(obj, context, - td_for_child)); + config::parse_or_get_factory_vector( + obj, context, td_for_child)); } if (auto& obj = config.get("post_uses_pre")) { factory.with_post_uses_pre(gko::config::get_value(obj)); @@ -627,8 +627,8 @@ typename Multigrid::parameters_type Multigrid::parse( } if (auto& obj = config.get("coarsest_solver")) { factory.with_coarsest_solver( - gko::config::get_factory_vector(obj, context, - td_for_child)); + config::parse_or_get_factory_vector( + obj, context, td_for_child)); } if (auto& obj = config.get("cycle")) { auto str = obj.get_string(); diff --git a/include/ginkgo/core/multigrid/pgm.hpp b/include/ginkgo/core/multigrid/pgm.hpp index 576c644ed00..6d57c2dcbac 100644 --- a/include/ginkgo/core/multigrid/pgm.hpp +++ b/include/ginkgo/core/multigrid/pgm.hpp @@ -134,7 +134,7 @@ class Pgm : public EnableLinOp>, /** * Create the parameters from the property_tree. - * Because this is directly tied to the specific type. The value/index type + * Because this is directly tied to the specific type, the value/index type * settings within config are ignored and type_descriptor is only used * for children objects. * diff --git a/include/ginkgo/core/solver/multigrid.hpp b/include/ginkgo/core/solver/multigrid.hpp index b8c5e5e51f2..8f6cc80026b 100644 --- a/include/ginkgo/core/solver/multigrid.hpp +++ b/include/ginkgo/core/solver/multigrid.hpp @@ -384,7 +384,7 @@ class Multigrid : public EnableLinOp, /** * Create the parameters from the property_tree. - * Because this is directly tied to the specific type. The value/index type + * Because this is directly tied to the specific type, the value/index type * settings within config are ignored and type_descriptor is only used * for children objects. *