RestrictProlong -> MgLevel, rstr_prlg -> mg_level

core/test/multigrid/amgx_pgm.cpp

@@ -57,10 +57,10 @@ class AmgxPgmFactory : public ::testing::Test {
  typename std::tuple_element<1, decltype(ValueIndexType())>::type;
  using Mtx = gko::matrix::Csr<value_type, index_type>;
  using Vec = gko::matrix::Dense<value_type>;
- using RestrictProlong = gko::multigrid::AmgxPgm<value_type, index_type>;
+ using MgLevel = gko::multigrid::AmgxPgm<value_type, index_type>;
  AmgxPgmFactory()
  : exec(gko::ReferenceExecutor::create()),
- amgxpgm_factory(RestrictProlong::build()
+ amgxpgm_factory(MgLevel::build()
  .with_max_iterations(2u)
  .with_max_unassigned_ratio(0.1)
  .with_deterministic(true)
@@ -69,7 +69,7 @@ class AmgxPgmFactory : public ::testing::Test {
  {}
 
  std::shared_ptr<const gko::Executor> exec;
- std::unique_ptr<typename RestrictProlong::Factory> amgxpgm_factory;
+ std::unique_ptr<typename MgLevel::Factory> amgxpgm_factory;
 };
 
 TYPED_TEST_CASE(AmgxPgmFactory, gko::test::ValueIndexTypes);
@@ -83,8 +83,8 @@ TYPED_TEST(AmgxPgmFactory, FactoryKnowsItsExecutor)
 
 TYPED_TEST(AmgxPgmFactory, DefaultSetting)
 {
- using RestrictProlong = typename TestFixture::RestrictProlong;
- auto factory = RestrictProlong::build().on(this->exec);
+ using MgLevel = typename TestFixture::MgLevel;
+ auto factory = MgLevel::build().on(this->exec);
 
  ASSERT_EQ(factory->get_parameters().max_iterations, 15u);
  ASSERT_EQ(factory->get_parameters().max_unassigned_ratio, 0.05);

include/ginkgo/core/multigrid/amgx_pgm.hpp

@@ -67,7 +67,7 @@ namespace multigrid {
  * @tparam ValueType precision of matrix elements
  * @tparam IndexType precision of matrix indexes
  *
- * @ingroup RestrictProlong
+ * @ingroup MultigridLevel
  * @ingroup Multigrid
  * @ingroup LinOp
  */

reference/test/multigrid/amgx_pgm_kernels.cpp

@@ -67,13 +67,13 @@ class AmgxPgm : public ::testing::Test {
  typename std::tuple_element<1, decltype(ValueIndexType())>::type;
  using Mtx = gko::matrix::Csr<value_type, index_type>;
  using Vec = gko::matrix::Dense<value_type>;
- using RestrictProlong = gko::multigrid::AmgxPgm<value_type, index_type>;
+ using MgLevel = gko::multigrid::AmgxPgm<value_type, index_type>;
  using VT = value_type;
  using real_type = gko::remove_complex<value_type>;
  using WeightMtx = gko::matrix::Csr<real_type, index_type>;
  AmgxPgm()
  : exec(gko::ReferenceExecutor::create()),
- amgxpgm_factory(RestrictProlong::build()
+ amgxpgm_factory(MgLevel::build()
  .with_max_iterations(2u)
  .with_max_unassigned_ratio(0.1)
  .on(exec)),
@@ -107,7 +107,7 @@ class AmgxPgm : public ::testing::Test {
  agg(exec, 5)
  {
  this->create_mtx(mtx.get(), weight.get(), &agg, coarse.get());
- rstr_prlg = amgxpgm_factory->generate(mtx);
+ mg_level = amgxpgm_factory->generate(mtx);
  mtx_diag = weight->extract_diagonal();
  }
 
@@ -210,8 +210,8 @@ class AmgxPgm : public ::testing::Test {
  std::shared_ptr<Vec> prolong_ans;
  std::shared_ptr<Vec> prolong_applyans;
  std::shared_ptr<Vec> fine_x;
- std::unique_ptr<typename RestrictProlong::Factory> amgxpgm_factory;
- std::unique_ptr<RestrictProlong> rstr_prlg;
+ std::unique_ptr<typename MgLevel::Factory> amgxpgm_factory;
+ std::unique_ptr<MgLevel> mg_level;
 };
 
 TYPED_TEST_SUITE(AmgxPgm, gko::test::ValueIndexTypes);
@@ -220,13 +220,12 @@ TYPED_TEST_SUITE(AmgxPgm, gko::test::ValueIndexTypes);
 TYPED_TEST(AmgxPgm, CanBeCopied)
 {
  using Mtx = typename TestFixture::Mtx;
- using RestrictProlong = typename TestFixture::RestrictProlong;
+ using MgLevel = typename TestFixture::MgLevel;
  auto copy = this->amgxpgm_factory->generate(Mtx::create(this->exec));
 
- copy->copy_from(this->rstr_prlg.get());
- auto copy_mtx =
- static_cast<RestrictProlong *>(copy.get())->get_system_matrix();
- auto copy_agg = static_cast<RestrictProlong *>(copy.get())->get_const_agg();
+ copy->copy_from(this->mg_level.get());
+ auto copy_mtx = copy->get_system_matrix();
+ auto copy_agg = copy->get_const_agg();
  auto copy_coarse = copy->get_coarse_op();
 
  this->assert_same_matrices(static_cast<const Mtx *>(copy_mtx.get()),
@@ -241,13 +240,12 @@ TYPED_TEST(AmgxPgm, CanBeCopied)
 TYPED_TEST(AmgxPgm, CanBeMoved)
 {
  using Mtx = typename TestFixture::Mtx;
- using RestrictProlong = typename TestFixture::RestrictProlong;
+ using MgLevel = typename TestFixture::MgLevel;
  auto copy = this->amgxpgm_factory->generate(Mtx::create(this->exec));
 
- copy->copy_from(std::move(this->rstr_prlg));
- auto copy_mtx =
- static_cast<RestrictProlong *>(copy.get())->get_system_matrix();
- auto copy_agg = static_cast<RestrictProlong *>(copy.get())->get_const_agg();
+ copy->copy_from(std::move(this->mg_level));
+ auto copy_mtx = copy->get_system_matrix();
+ auto copy_agg = copy->get_const_agg();
  auto copy_coarse = copy->get_coarse_op();
 
  this->assert_same_matrices(static_cast<const Mtx *>(copy_mtx.get()),
@@ -262,13 +260,11 @@ TYPED_TEST(AmgxPgm, CanBeMoved)
 TYPED_TEST(AmgxPgm, CanBeCloned)
 {
  using Mtx = typename TestFixture::Mtx;
- using RestrictProlong = typename TestFixture::RestrictProlong;
- auto clone = this->rstr_prlg->clone();
+ using MgLevel = typename TestFixture::MgLevel;
+ auto clone = this->mg_level->clone();
  auto clone_mtx = clone->get_system_matrix();
- auto clone_agg =
- static_cast<RestrictProlong *>(clone.get())->get_const_agg();
- auto clone_coarse =
- dynamic_cast<RestrictProlong *>(clone.get())->get_coarse_op();
+ auto clone_agg = clone->get_const_agg();
+ auto clone_coarse = clone->get_coarse_op();
 
  this->assert_same_matrices(static_cast<const Mtx *>(clone_mtx.get()),
  this->mtx.get());
@@ -281,13 +277,12 @@ TYPED_TEST(AmgxPgm, CanBeCloned)
 
 TYPED_TEST(AmgxPgm, CanBeCleared)
 {
- using RestrictProlong = typename TestFixture::RestrictProlong;
+ using MgLevel = typename TestFixture::MgLevel;
 
- this->rstr_prlg->clear();
- auto mtx = static_cast<RestrictProlong *>(this->rstr_prlg.get())
- ->get_system_matrix();
- auto coarse = this->rstr_prlg->get_coarse_op();
- auto agg = static_cast<RestrictProlong *>(this->rstr_prlg.get())->get_agg();
+ this->mg_level->clear();
+ auto mtx = this->mg_level->get_system_matrix();
+ auto coarse = this->mg_level->get_coarse_op();
+ auto agg = this->mg_level->get_agg();
 
  ASSERT_EQ(mtx, nullptr);
  ASSERT_EQ(coarse, nullptr);