#1672: lb: revert to getLoad in ElementStats

DARMA-tasking · May 30, 2022 · 8124440 · 8124440
1 parent a2daa34
commit 8124440
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/vt/elm/elm_lb_data.cc b/src/vt/elm/elm_lb_data.cc
@@ -163,7 +163,7 @@ PhaseType ElementLBData::getPhase() const {
   return cur_phase_;
 }
 
-TimeType ElementLBData::getModeledLoad(PhaseType const& phase) const {
+TimeType ElementLBData::getLoad(PhaseType const& phase) const {
   auto iter = phase_timings_.find(phase);
   if (iter != phase_timings_.end()) {
     TimeTypeWrapper const total_load = phase_timings_.at(phase);
@@ -181,9 +181,9 @@ TimeType ElementLBData::getModeledLoad(PhaseType const& phase) const {
 }
 
 TimeType
-ElementLBData::getModeledLoad(PhaseType phase, SubphaseType subphase) const {
+ElementLBData::getLoad(PhaseType phase, SubphaseType subphase) const {
   if (subphase == no_subphase)
-    return getModeledLoad(phase);
+    return getLoad(phase);
 
   auto const& subphase_loads = subphase_timings_.at(phase);
 

diff --git a/src/vt/elm/elm_lb_data.h b/src/vt/elm/elm_lb_data.h
@@ -84,8 +84,8 @@ struct ElementLBData {
   void updatePhase(PhaseType const& inc = 1);
   void resetPhase();
   PhaseType getPhase() const;
-  TimeType getModeledLoad(PhaseType const& phase) const;
-  TimeType getModeledLoad(PhaseType phase, SubphaseType subphase) const;
+  TimeType getLoad(PhaseType const& phase) const;
+  TimeType getLoad(PhaseType phase, SubphaseType subphase) const;
 
   CommMapType const& getComm(PhaseType const& phase);
   std::vector<CommMapType> const& getSubphaseComm(PhaseType phase);

diff --git a/src/vt/vrt/collection/balance/node_lb_data.cc b/src/vt/vrt/collection/balance/node_lb_data.cc
@@ -263,7 +263,7 @@ void NodeLBData::addNodeLBData(
   );
 
   auto const phase = in->getPhase();
-  auto const& total_load = in->getModeledLoad(phase, focused_subphase);
+  auto const& total_load = in->getLoad(phase, focused_subphase);
 
   auto &phase_data = lb_data_->node_data_[phase];
   auto elm_iter = phase_data.find(id);