#476 rename SerdeTestLB to TestSerializationLB

DARMA-tasking · May 24, 2022 · 1b84452 · 1b84452
1 parent 30c12e1
commit 1b84452
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 58 deletions.
diff --git a/docs/md/lb-manager.md b/docs/md/lb-manager.md
@@ -55,16 +55,16 @@ To print LB specification during startup, use `--vt_lb_show_spec` command line f
 
 \section load-balancers Load balancers
 
-| Load Balancer  | Type                    | Description                                                                         | Reference                                 |
-| -------------- | ----------------------- | ----------------------------------------------------------------------------------- | ----------------------------------------- |
-| RotateLB       | Testing                 | Rotate objects in a ring                                                            | `vt::vrt::collection::lb::RotateLB`       |
-| RandomLB       | Testing                 | Randomly migrate object with seed                                                   | `vt::vrt::collection::lb::RandomLB`       |
-| GreedyLB       | Centralized             | Gather to central node apply min/max heap                                           | `vt::vrt::collection::lb::GreedyLB`       |
-| TemperedLB     | Distributed             | Inspired by epidemic algorithms                                                     | `vt::vrt::collection::lb::TemperedLB`     |
-| HierarchicalLB | Hierarchical            | Build tree to move objects nodes                                                    | `vt::vrt::collection::lb::HierarchicalLB` |
-| ZoltanLB       | Hyper-graph Partitioner | Run Zoltan in hyper-graph mode to LB                                                | `vt::vrt::collection::lb::ZoltanLB`       |
-| OfflineLB      | User-specified          | Read file to determine mapping                                                      | `vt::vrt::collection::lb::OfflineLB`      |
-| SerdeTestLB    | Testing                 | Migrate objects to the same node, for testing serialization/deserialization purpose | `vt::vrt::collection::lb::SerdeTestLB`    |
+| Load Balancer       | Type                    | Description                                                                         | Reference                                      |
+| ------------------- | ----------------------- | ----------------------------------------------------------------------------------- | ---------------------------------------------- |
+| RotateLB            | Testing                 | Rotate objects in a ring                                                            | `vt::vrt::collection::lb::RotateLB`            |
+| RandomLB            | Testing                 | Randomly migrate object with seed                                                   | `vt::vrt::collection::lb::RandomLB`            |
+| GreedyLB            | Centralized             | Gather to central node apply min/max heap                                           | `vt::vrt::collection::lb::GreedyLB`            |
+| TemperedLB          | Distributed             | Inspired by epidemic algorithms                                                     | `vt::vrt::collection::lb::TemperedLB`          |
+| HierarchicalLB      | Hierarchical            | Build tree to move objects nodes                                                    | `vt::vrt::collection::lb::HierarchicalLB`      |
+| ZoltanLB            | Hyper-graph Partitioner | Run Zoltan in hyper-graph mode to LB                                                | `vt::vrt::collection::lb::ZoltanLB`            |
+| OfflineLB           | User-specified          | Read file to determine mapping                                                      | `vt::vrt::collection::lb::OfflineLB`           |
+| TestSerializationLB | Testing                 | Migrate objects to the same node, for testing serialization/deserialization purpose | `vt::vrt::collection::lb::TestSerializationLB` |
 
 \section load-models Object Load Models
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -89,7 +89,7 @@ set(
         vrt/collection/balance/offlinelb
         vrt/collection/balance/zoltanlb
         vrt/collection/balance/randomlb
-        vrt/collection/balance/serdetestlb
+        vrt/collection/balance/testserializationlb
         vrt/collection/balance/lb_invoke
         vrt/collection/balance/model
         vrt/collection/balance/proxy

diff --git a/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc b/src/vt/vrt/collection/balance/lb_invoke/lb_manager.cc
@@ -58,7 +58,7 @@
 #include "vt/vrt/collection/balance/lb_data_restart_reader.h"
 #include "vt/vrt/collection/balance/zoltanlb/zoltanlb.h"
 #include "vt/vrt/collection/balance/randomlb/randomlb.h"
-#include "vt/vrt/collection/balance/serdetestlb/serdetestlb.h"
+#include "vt/vrt/collection/balance/testserializationlb/testserializationlb.h"
 #include "vt/vrt/collection/messages/system_create.h"
 #include "vt/vrt/collection/manager.fwd.h"
 #include "vt/utils/memory/memory_usage.h"
@@ -270,16 +270,16 @@ void LBManager::startLB(
   }
 
   switch (lb) {
-  case LBType::HierarchicalLB: lb_instances_["chosen"] = makeLB<lb::HierarchicalLB>(); break;
-  case LBType::GreedyLB:       lb_instances_["chosen"] = makeLB<lb::GreedyLB>();       break;
-  case LBType::RotateLB:       lb_instances_["chosen"] = makeLB<lb::RotateLB>();       break;
-  case LBType::TemperedLB:     lb_instances_["chosen"] = makeLB<lb::TemperedLB>();     break;
-  case LBType::OfflineLB:     lb_instances_["chosen"] = makeLB<lb::OfflineLB>();     break;
-  case LBType::RandomLB:       lb_instances_["chosen"] = makeLB<lb::RandomLB>();       break;
+  case LBType::HierarchicalLB:      lb_instances_["chosen"] = makeLB<lb::HierarchicalLB>();      break;
+  case LBType::GreedyLB:            lb_instances_["chosen"] = makeLB<lb::GreedyLB>();            break;
+  case LBType::RotateLB:            lb_instances_["chosen"] = makeLB<lb::RotateLB>();            break;
+  case LBType::TemperedLB:          lb_instances_["chosen"] = makeLB<lb::TemperedLB>();          break;
+  case LBType::OfflineLB:           lb_instances_["chosen"] = makeLB<lb::OfflineLB>();           break;
+  case LBType::RandomLB:            lb_instances_["chosen"] = makeLB<lb::RandomLB>();            break;
 #   if vt_check_enabled(zoltan)
-  case LBType::ZoltanLB:       lb_instances_["chosen"] = makeLB<lb::ZoltanLB>();       break;
+  case LBType::ZoltanLB:            lb_instances_["chosen"] = makeLB<lb::ZoltanLB>();            break;
 #   endif
-  case LBType::SerdeTestLB:    lb_instances_["chosen"] = makeLB<lb::SerdeTestLB>();    break;
+  case LBType::TestSerializationLB: lb_instances_["chosen"] = makeLB<lb::TestSerializationLB>(); break;
   case LBType::NoLB:
     vtAssert(false, "LBType::NoLB is not a valid LB for collectiveImpl");
     break;
@@ -330,8 +330,8 @@ void LBManager::printLBArgsHelp(LBType lb) {
     help = lb::ZoltanLB::getInputKeysWithHelp();
     break;
 # endif
-  case LBType::SerdeTestLB:
-    help = lb::SerdeTestLB::getInputKeysWithHelp();
+  case LBType::TestSerializationLB:
+    help = lb::TestSerializationLB::getInputKeysWithHelp();
     break;
   case LBType::NoLB:
     // deliberately skip retrieving arguments

diff --git a/src/vt/vrt/collection/balance/lb_type.cc b/src/vt/vrt/collection/balance/lb_type.cc
@@ -50,17 +50,17 @@ namespace vt { namespace vrt { namespace collection {
 namespace balance {
 
 static std::unordered_map<LBType,std::string> lb_names_ = {
-  {LBType::NoLB,           std::string{"NoLB"          }},
+  {LBType::NoLB,                std::string{"NoLB"               }},
 # if vt_check_enabled(zoltan)
-  {LBType::ZoltanLB,       std::string{"ZoltanLB"      }},
+  {LBType::ZoltanLB,            std::string{"ZoltanLB"           }},
 # endif
-  {LBType::GreedyLB,       std::string{"GreedyLB"      }},
-  {LBType::HierarchicalLB, std::string{"HierarchicalLB"}},
-  {LBType::RotateLB,       std::string{"RotateLB"      }},
-  {LBType::TemperedLB,     std::string{"TemperedLB"    }},
-  {LBType::OfflineLB,      std::string{"OfflineLB"    }},
-  {LBType::RandomLB,       std::string{"RandomLB"      }},
-  {LBType::SerdeTestLB,    std::string{"SerdeTestLB"   }},
+  {LBType::GreedyLB,            std::string{"GreedyLB"           }},
+  {LBType::HierarchicalLB,      std::string{"HierarchicalLB"     }},
+  {LBType::RotateLB,            std::string{"RotateLB"           }},
+  {LBType::TemperedLB,          std::string{"TemperedLB"         }},
+  {LBType::OfflineLB,           std::string{"OfflineLB"          }},
+  {LBType::RandomLB,            std::string{"RandomLB"           }},
+  {LBType::TestSerializationLB, std::string{"TestSerializationLB"}},
 };
 
 std::unordered_map<LBType, std::string>& get_lb_names() {

diff --git a/src/vt/vrt/collection/balance/lb_type.h b/src/vt/vrt/collection/balance/lb_type.h
@@ -53,17 +53,17 @@
 namespace vt { namespace vrt { namespace collection { namespace balance {
 
 enum struct LBType : int8_t {
-    NoLB             = 0
-  , GreedyLB         = 1
-  , HierarchicalLB   = 2
-  , RotateLB         = 3
-  , TemperedLB       = 4
-  , OfflineLB        = 5
+    NoLB                = 0
+  , GreedyLB            = 1
+  , HierarchicalLB      = 2
+  , RotateLB            = 3
+  , TemperedLB          = 4
+  , OfflineLB           = 5
 # if vt_check_enabled(zoltan)
-  , ZoltanLB         = 6
+  , ZoltanLB            = 6
 # endif
-  , RandomLB         = 7
-  , SerdeTestLB      = 8
+  , RandomLB            = 7
+  , TestSerializationLB = 8
 };
 
 }}}} /* end namespace vt::vrt::collection::balance */

diff --git a/...ection/balance/serdetestlb/serdetestlb.cc → ...estserializationlb/testserializationlb.cc b/...ection/balance/serdetestlb/serdetestlb.cc → ...estserializationlb/testserializationlb.cc
@@ -2,7 +2,7 @@
 //@HEADER
 // *****************************************************************************
 //
-//                                serdetestlb.cc
+//                            testserializationlb.cc
 //                       DARMA/vt => Virtual Transport
 //
 // Copyright 2019-2021 National Technology & Engineering Solutions of Sandia, LLC
@@ -41,32 +41,32 @@
 //@HEADER
 */
 
-#include "vt/vrt/collection/balance/serdetestlb/serdetestlb.h"
+#include "vt/vrt/collection/balance/testserializationlb/testserializationlb.h"
 #include "vt/vrt/collection/balance/model/load_model.h"
 
 namespace vt { namespace vrt { namespace collection { namespace lb {
 
 /*static*/ std::unordered_map<std::string, std::string>
-SerdeTestLB::getInputKeysWithHelp() {
+TestSerializationLB::getInputKeysWithHelp() {
   return std::unordered_map<std::string, std::string>{};
 }
 
-void SerdeTestLB::init(objgroup::proxy::Proxy<SerdeTestLB>) {
+void TestSerializationLB::init(objgroup::proxy::Proxy<TestSerializationLB>) {
   vtAssert(
     theConfig()->vt_lb_self_migration,
-    "SerdeTestLB::init(): vt_lb_self_migration flag must be set to use SerdeTestLB\n"
+    "TestSerializationLB::init(): vt_lb_self_migration flag must be set to use TestSerializationLB\n"
   );
 }
 
-void SerdeTestLB::inputParams(balance::SpecEntry*) { }
+void TestSerializationLB::inputParams(balance::SpecEntry*) { }
 
-void SerdeTestLB::runLB(TimeType) {
+void TestSerializationLB::runLB(TimeType) {
   auto const this_node = theContext()->getNode();
   for (auto obj : *load_model_) {
     TimeTypeWrapper const load = load_model_->getWork(obj, {balance::PhaseOffset::NEXT_PHASE, balance::PhaseOffset::WHOLE_PHASE});
     vt_debug_print(
       terse, lb,
-      "\t SerdeTestLB::migrating object to: obj={}, load={}, from_node={} to_node={}\n",
+      "\t TestSerializationLB::migrating object to: obj={}, load={}, from_node={} to_node={}\n",
       obj, load, this_node, this_node
     );
 

diff --git a/...lection/balance/serdetestlb/serdetestlb.h → ...testserializationlb/testserializationlb.h b/...lection/balance/serdetestlb/serdetestlb.h → ...testserializationlb/testserializationlb.h
@@ -2,7 +2,7 @@
 //@HEADER
 // *****************************************************************************
 //
-//                                serdetestlb.h
+//                            testserializationlb.h
 //                       DARMA/vt => Virtual Transport
 //
 // Copyright 2019-2021 National Technology & Engineering Solutions of Sandia, LLC
@@ -41,8 +41,8 @@
 //@HEADER
 */
 
-#if !defined INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_SERDETESTLB_H
-#define INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_SERDETESTLB_H
+#if !defined INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_TESTSERIALIZATIONLB_H
+#define INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_TESTSERIALIZATIONLB_H
 
 #include "vt/config.h"
 #include "vt/messaging/message.h"
@@ -55,11 +55,11 @@
 
 namespace vt { namespace vrt { namespace collection { namespace lb {
 
-struct SerdeTestLB : BaseLB {
-  SerdeTestLB() = default;
-  virtual ~SerdeTestLB() {}
+struct TestSerializationLB : BaseLB {
+  TestSerializationLB() = default;
+  virtual ~TestSerializationLB() {}
 
-  void init(objgroup::proxy::Proxy<SerdeTestLB> in_proxy);
+  void init(objgroup::proxy::Proxy<TestSerializationLB> in_proxy);
   void runLB(TimeType) override;
   void inputParams(balance::SpecEntry* spec) override;
 
@@ -68,4 +68,4 @@ struct SerdeTestLB : BaseLB {
 
 }}}} /* end namespace vt::vrt::collection::lb */
 
-#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_SERDETESTLB_H*/
+#endif /*INCLUDED_VT_VRT_COLLECTION_BALANCE_SERDETESTLB_TESTSERIALIZATIONLB_H*/
diff --git a/tests/unit/collection/test_lb.extended.cc b/tests/unit/collection/test_lb.extended.cc
@@ -625,9 +625,9 @@ void serdeColHandler(SerdeTestMsg *, SerdeTestCol *col) {
 void runSerdeTest() {
   theConfig()->vt_lb = true;
   theConfig()->vt_lb_self_migration = true;
-  theConfig()->vt_lb_name = "SerdeTestLB";
+  theConfig()->vt_lb_name = "TestSerializationLB";
   if (theContext()->getNode() == 0) {
-    ::fmt::print("Testing LB: SerdeTestLB\n");
+    ::fmt::print("Testing LB: TestSerializationLB\n");
   }
 
   theCollective()->barrier();