#1122: collection: rename for consistency

DARMA-tasking · Nov 6, 2020 · da88437 · da88437
1 parent 4ff8dc9
commit da88437
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/vt/vrt/collection/balance/elm_stats.cc b/src/vt/vrt/collection/balance/elm_stats.cc
@@ -82,7 +82,7 @@ void ElementStats::stopTime() {
 void ElementStats::recvComm(
   LBCommKey key, double bytes
 ) {
-  comm_[cur_phase_][key].receiveMsg(bytes);
+  phase_comm_[cur_phase_][key].receiveMsg(bytes);
   subphase_comm_[cur_phase_].resize(cur_subphase_ + 1);
   subphase_comm_[cur_phase_].at(cur_subphase_)[key].receiveMsg(bytes);
 }
@@ -170,7 +170,7 @@ TimeType ElementStats::getLoad(PhaseType phase, SubphaseType subphase) const {
 
 CommMapType const&
 ElementStats::getComm(PhaseType const& phase) {
-  auto const& phase_comm = comm_[phase];
+  auto const& phase_comm = phase_comm_[phase];
 
   vt_debug_print(
     lb, node,
@@ -206,7 +206,7 @@ void ElementStats::releaseStatsFromUnneededPhases(PhaseType phase, unsigned int
   if (phase >= look_back) {
     phase_timings_.erase(phase - look_back);
     subphase_timings_.erase(phase - look_back);
-    comm_.erase(phase - look_back);
+    phase_comm_.erase(phase - look_back);
     subphase_comm_.erase(phase - look_back);
   }
 }
@@ -216,7 +216,7 @@ std::size_t ElementStats::getLoadPhaseCount() const {
 }
 
 std::size_t ElementStats::getCommPhaseCount() const {
-  return comm_.size();
+  return phase_comm_.size();
 }
 
 std::size_t ElementStats::getSubphaseLoadPhaseCount() const {

diff --git a/src/vt/vrt/collection/balance/elm_stats.h b/src/vt/vrt/collection/balance/elm_stats.h
@@ -122,7 +122,7 @@ struct ElementStats {
   TimeType cur_time_ = 0.0;
   PhaseType cur_phase_ = fst_lb_phase;
   std::unordered_map<PhaseType, TimeType> phase_timings_ = {};
-  std::unordered_map<PhaseType, CommMapType> comm_ = {};
+  std::unordered_map<PhaseType, CommMapType> phase_comm_ = {};
 
   SubphaseType cur_subphase_ = 0;
   std::unordered_map<PhaseType, std::vector<TimeType>> subphase_timings_ = {};

diff --git a/src/vt/vrt/collection/balance/elm_stats.impl.h b/src/vt/vrt/collection/balance/elm_stats.impl.h
@@ -65,7 +65,7 @@ void ElementStats::serialize(Serializer& s) {
   s | cur_time_;
   s | cur_phase_;
   s | phase_timings_;
-  s | comm_;
+  s | phase_comm_;
   s | cur_subphase_;
   s | subphase_timings_;
 }