#1596: elm: fix some rebase problems

DARMA-tasking · Dec 16, 2021 · b5b209d · b5b209d
1 parent 0ce2bf1
commit b5b209d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/vt/vrt/collection/balance/lb_common.cc b/src/vt/vrt/collection/balance/lb_common.cc
@@ -92,7 +92,7 @@ void applyReassignment(const std::shared_ptr<const balance::Reassignment> &reass
       vt_debug_print(
                      normal, lb,
                      "migrateObjectTo, obj_id={}, home={}, from={}, to={}\n",
-                     obj_id.id, obj_id.home_node, from, to
+                     obj_id.id, obj_id.getHomeNode(), from, to
                      );
 
       theNodeStats()->migrateObjTo(obj_id, to);

diff --git a/src/vt/vrt/collection/balance/stats_data.cc b/src/vt/vrt/collection/balance/stats_data.cc
@@ -181,7 +181,7 @@ StatsData::StatsData(nlohmann::json const& j) {
             vtAssertExpr(object.is_number());
 
             auto elm = ElementIDStruct{object, node};
-            this->node_data_[id][elm] = time;
+            this->node_data_[id][elm].whole_phase_load = time;
 
             if (
               task["entity"].find("collection_id") != task["entity"].end() and

diff --git a/tests/unit/lb/test_lb_stats_reader.cc b/tests/unit/lb/test_lb_stats_reader.cc
@@ -120,7 +120,7 @@ TEST_F(TestLBStatsReader, test_lb_stats_read_1) {
         auto permID = elm::ElmIDBits::createCollectionImpl(
           true, elmID+1, in, in
         );
-        sd->node_data_[phase][permID] = tval;
+        sd->node_data_[phase][permID].whole_phase_load = tval;
       }
     }
   }