#2150: LB: Remove BaseLB::loadMilli and use TimeType::milliseconds in…

…stead
DARMA-tasking · May 30, 2023 · fd7266b · fd7266b
1 parent 8972a7b
commit fd7266b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/src/vt/vrt/collection/balance/baselb/baselb.cc b/src/vt/vrt/collection/balance/baselb/baselb.cc
@@ -84,12 +84,6 @@ std::shared_ptr<const balance::Reassignment> BaseLB::startLB(
   return normalizeReassignments();
 }
 
-/*static*/
-BaseLB::LoadType BaseLB::loadMilli(LoadType const& load) {
-  // Convert `load` in seconds to milliseconds, typically for binning purposes
-  return load * 1000;
-}
-
 void BaseLB::importProcessorData(
   StatisticMapType const& in_stats, ElementCommType const& comm_in
 ) {

diff --git a/src/vt/vrt/collection/balance/baselb/baselb.h b/src/vt/vrt/collection/balance/baselb/baselb.h
@@ -118,8 +118,6 @@ struct BaseLB {
     StatisticMapType const& in_stats, ElementCommType const& cm
   );
 
-  static LoadType loadMilli(LoadType const& load);
-
   void notifyCurrentHostNodeOfObjectsDeparting(
     TransferMsg<ObjDestinationListType>* msg
   );

diff --git a/src/vt/vrt/collection/balance/baselb/load_sampler.cc b/src/vt/vrt/collection/balance/baselb/load_sampler.cc
@@ -52,7 +52,7 @@ void LoadSamplerBaseLB::buildHistogram() {
     TimeType load = load_model_->getModeledLoad(
       obj, {balance::PhaseOffset::NEXT_PHASE, balance::PhaseOffset::WHOLE_PHASE}
     );
-    auto const& load_milli = loadMilli(load.seconds());
+    auto const& load_milli = load.milliseconds();
     auto const& bin = histogramSample(load_milli);
     if (obj.isMigratable()) {
       obj_sample[bin].push_back(obj);

diff --git a/src/vt/vrt/collection/balance/greedylb/greedylb.cc b/src/vt/vrt/collection/balance/greedylb/greedylb.cc
@@ -144,7 +144,7 @@ void GreedyLB::inputParams(balance::ConfigEntry* config) {
 }
 
 void GreedyLB::runLB(TimeType total_load) {
-  this_load = loadMilli(total_load.seconds());
+  this_load = total_load.milliseconds();
   buildHistogram();
   loadStats();
 }
@@ -413,9 +413,9 @@ void GreedyLB::loadOverBin(ObjBinType bin, ObjBinListType& bin_list) {
   load_over[bin].push_back(obj_id);
   bin_list.pop_back();
 
-  auto const& obj_time_milli = loadMilli(load_model_->getModeledLoad(
+  auto const& obj_time_milli = load_model_->getModeledLoad(
     obj_id, {balance::PhaseOffset::NEXT_PHASE, balance::PhaseOffset::WHOLE_PHASE}
-  ).seconds());
+  ).milliseconds();
 
   this_load -= obj_time_milli;
 

diff --git a/src/vt/vrt/collection/balance/hierarchicallb/hierlb.cc b/src/vt/vrt/collection/balance/hierarchicallb/hierlb.cc
@@ -312,9 +312,9 @@ void HierarchicalLB::loadOverBin(ObjBinType bin, ObjBinListType& bin_list) {
   load_over[bin].push_back(obj_id);
   bin_list.pop_back();
 
-  auto const& obj_time_milli = loadMilli(load_model_->getModeledLoad(obj_id,
+  auto const& obj_time_milli = load_model_->getModeledLoad(obj_id,
     {balance::PhaseOffset::NEXT_PHASE, balance::PhaseOffset::WHOLE_PHASE}
-  ).seconds());
+  ).milliseconds();
 
   this_load -= obj_time_milli;
 

diff --git a/src/vt/vrt/collection/balance/zoltanlb/zoltanlb.cc b/src/vt/vrt/collection/balance/zoltanlb/zoltanlb.cc
@@ -131,7 +131,7 @@ void ZoltanLB::inputParams(balance::ConfigEntry* config) {
 
 void ZoltanLB::runLB(TimeType total_load) {
   auto const& this_node = theContext()->getNode();
-  this_load = loadMilli(total_load);
+  this_load = total_load.milliseconds());
 
   if (this_node == 0) {
     vt_debug_print(terse, lb, "ZoltanLB: runLB: edges={}\n", do_edges_);
@@ -487,7 +487,7 @@ std::unique_ptr<ZoltanLB::Graph> ZoltanLB::makeGraph() {
         obj,
         {balance::PhaseOffset::NEXT_PHASE, balance::PhaseOffset::WHOLE_PHASE}
       );
-      auto time = static_cast<int>(loadMilli(load));
+      auto time = static_cast<int>(load.milliseconds());
       graph->vertex_weight[idx++] = time;
     }
   }