#941: fixed build issues

DARMA-tasking · Sep 23, 2020 · db9a8d1 · db9a8d1
1 parent 90d9d68
commit db9a8d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/vt/vrt/collection/balance/elm_stats.cc b/src/vt/vrt/collection/balance/elm_stats.cc
@@ -148,23 +148,21 @@ PhaseType ElementStats::getPhase() const {
   return cur_phase_;
 }
 
-TimeType ElementStats::getLoad(PhaseType const& phase
-  SubphaseType const& subphase) const {
+TimeType ElementStats::getLoad(PhaseType const& phase) const {
   vtAssert(phase_timings_.size() > phase, "Must have phase");
 
   auto const& total_load = phase_timings_.at(phase);
 
   vt_debug_print(
               lb, node,
-              "ElementStats: getLoad: load={}, phase={}, subphase={}, size={}\n",
-              total_load, phase, subphase, phase_timings_.size()
+              "ElementStats: getLoad: load={}, phase={}, size={}\n",
+              total_load, phase, phase_timings_.size()
               );
 
   return total_load;
 }
 
-TimeType ElementStats::getLoad(PhaseType phase,
-  SubphaseType const& subphase) const {
+TimeType ElementStats::getLoad(PhaseType phase, SubphaseType subphase) const {
   if (subphase == no_subphase)
     return getLoad(phase);
 
@@ -184,8 +182,7 @@ TimeType ElementStats::getLoad(PhaseType phase,
 }
 
 CommMapType const&
-ElementStats::getComm(PhaseType const& phase,
-  SubphaseType const& subphase) {
+ElementStats::getComm(PhaseType const& phase, SubphaseType const& subphase) {
   comm_.resize(phase + 1);
   auto const& phase_comm = comm_[phase];
 

diff --git a/src/vt/vrt/collection/balance/elm_stats.h b/src/vt/vrt/collection/balance/elm_stats.h
@@ -90,7 +90,7 @@ struct ElementStats {
   TimeType getLoad(PhaseType const& phase) const;
   TimeType getLoad(PhaseType phase, SubphaseType subphase) const;
 
-  CommMapType const& getComm(PhaseType const& phase);
+  CommMapType const& getComm(PhaseType const& phase, SubphaseType const& subphase);
   void setSubPhase(SubphaseType subphase);
   SubphaseType getSubPhase() const;
 

diff --git a/src/vt/vrt/collection/balance/elm_stats.impl.h b/src/vt/vrt/collection/balance/elm_stats.impl.h
@@ -89,7 +89,7 @@ template <typename ColT>
   auto const& untyped_proxy = col->getProxy();
   auto const& total_load = stats.getLoad(cur_phase, getFocusedSubPhase(untyped_proxy));
   auto const& subphase_loads = stats.subphase_timings_.at(cur_phase);
-  auto const& comm = stats.getComm(cur_phase);
+  auto const& comm = stats.getComm(cur_phase, getFocusedSubPhase(untyped_proxy));
   auto const& idx = col->getIndex();
   auto const& elm_proxy = proxy[idx];