diff --git a/core/config/registry.cpp b/core/config/registry.cpp index f00fd990af1..afa1fda1f4b 100644 --- a/core/config/registry.cpp +++ b/core/config/registry.cpp @@ -43,9 +43,10 @@ configuration_map generate_config_map() {"preconditioner::Ilu", parse}, {"preconditioner::Isai", parse}, {"preconditioner::Jacobi", parse}, - {"Multigrid", parse}, - {"Pgm", parse}, - {"FixedCoarsening", parse}}; + {"solver::Multigrid", parse}, + {"multigrid::Pgm", parse}, + {"multigrid::FixedCoarsening", + parse}}; } diff --git a/core/test/config/multigrid.cpp b/core/test/config/multigrid.cpp index 6eb098d8ecd..d683d9102d5 100644 --- a/core/test/config/multigrid.cpp +++ b/core/test/config/multigrid.cpp @@ -33,15 +33,18 @@ struct MultigridLevelConfigTest { static void change_template(pnode::map_type& config_map) { - config_map["ValueType"] = pnode{"float"}; - config_map["IndexType"] = pnode{"int64"}; + config_map["value_type"] = pnode{"float32"}; + config_map["index_type"] = pnode{"int64"}; } }; struct Pgm : MultigridLevelConfigTest, gko::multigrid::Pgm> { - static pnode::map_type setup_base() { return {{"Type", pnode{"Pgm"}}}; } + static pnode::map_type setup_base() + { + return {{"type", pnode{"multigrid::Pgm"}}}; + } template static void set(pnode::map_type& config_map, ParamType& param, registry reg, @@ -77,7 +80,7 @@ struct FixedCoarsening : MultigridLevelConfigTest< gko::multigrid::FixedCoarsening> { static pnode::map_type setup_base() { - return {{"Type", pnode{"FixedCoarsening"}}}; + return {{"type", pnode{"multigrid::FixedCoarsening"}}}; } template @@ -109,7 +112,7 @@ class MultigridLevel : public ::testing::Test { using Config = T; MultigridLevel() - : exec(gko::ReferenceExecutor::create()), td("double", "int"), reg() + : exec(gko::ReferenceExecutor::create()), td("float64", "int32"), reg() {} std::shared_ptr exec; @@ -173,7 +176,7 @@ using DummyStop = gko::stop::Iteration; struct MultigridConfig { static pnode::map_type setup_base() { - return {{"Type", pnode{"Multigrid"}}}; + return {{"type", pnode{"solver::Multigrid"}}}; } template @@ -231,24 +234,24 @@ struct MultigridConfig { reg, "coarsest_solver")); } else { config_map["criteria"] = - pnode{pnode::map_type{{"Type", pnode{"Iteration"}}}}; + pnode{pnode::map_type{{"type", pnode{"stop::Iteration"}}}}; param.with_criteria(DummyStop::build().on(exec)); config_map["mg_level"] = pnode{std::vector{ - pnode{pnode::map_type{{"Type", pnode{"Pgm"}}}}, - pnode{pnode::map_type{{"Type", pnode{"Pgm"}}}}}}; + pnode{pnode::map_type{{"type", pnode{"multigrid::Pgm"}}}}, + pnode{pnode::map_type{{"type", pnode{"multigrid::Pgm"}}}}}}; param.with_mg_level(DummyMgLevel::build().on(exec), DummyMgLevel::build().on(exec)); config_map["pre_smoother"] = - pnode{pnode::map_type{{"Type", pnode{"Ir"}}}}; + pnode{pnode::map_type{{"type", pnode{"solver::Ir"}}}}; param.with_pre_smoother(DummySmoother::build().on(exec)); config_map["post_smoother"] = - pnode{pnode::map_type{{"Type", pnode{"Ir"}}}}; + pnode{pnode::map_type{{"type", pnode{"solver::Ir"}}}}; param.with_post_smoother(DummySmoother::build().on(exec)); config_map["mid_smoother"] = - pnode{pnode::map_type{{"Type", pnode{"Ir"}}}}; + pnode{pnode::map_type{{"type", pnode{"solver::Ir"}}}}; param.with_mid_smoother(DummySmoother::build().on(exec)); config_map["coarsest_solver"] = - pnode{pnode::map_type{{"Type", pnode{"Ir"}}}}; + pnode{pnode::map_type{{"type", pnode{"solver::Ir"}}}}; param.with_coarsest_solver(DummySmoother::build().on(exec)); } config_map["level_selector"] = pnode{"first_for_top"}; @@ -341,7 +344,7 @@ class MultigridT : public ::testing::Test { MultigridT() : exec(gko::ReferenceExecutor::create()), - td("double", "int"), + td("float64", "int32"), mg_level_0(DummyMgLevel::build().on(exec)), mg_level_1(DummyMgLevel::build().on(exec)), criterion_factory(DummyStop::build().on(exec)),