Merge pull request #2436 from DARMA-tasking/2435-temperedlb-improvementsoptimizations

2435 temperedlb improvements/optimizations

Author: lifflander

src/vt/vrt/collection/balance/temperedlb/tempered_msgs.h

@@ -57,8 +57,11 @@ using BytesType        = double;
 struct ClusterInfo {
   LoadType load = 0;
   BytesType bytes = 0;
+  SharedIDType shared_id = -1;
   double intra_send_vol = 0, intra_recv_vol = 0;
-  std::unordered_map<NodeType, double> inter_send_vol, inter_recv_vol;
+  std::unordered_map<SharedIDType, double> inter_cluster_send_vol,
+    inter_cluster_recv_vol;
+  std::unordered_map<elm::ElementIDStruct, double> obj_send_vol, obj_recv_vol;
   NodeType home_node = uninitialized_destination;
   BytesType edge_weight = 0;
   BytesType max_object_working_bytes = 0;
@@ -67,10 +70,35 @@ struct ClusterInfo {
   BytesType max_object_serialized_bytes_outside = 0;
   BytesType cluster_footprint = 0;
 
+  void addInterClusterEdge(bool is_send, SharedIDType id, double volume) {
+    if (is_send) {
+      inter_cluster_send_vol[id] += volume;
+    } else {
+      inter_cluster_recv_vol[id] += volume;
+    }
+  }
+
+  void addIntraVolume(bool is_send, double volume) {
+    if (is_send) {
+      intra_send_vol += volume;
+    } else {
+      intra_recv_vol += volume;
+    }
+  }
+
+  void addObjEdge(bool is_send, elm::ElementIDStruct obj, double volume) {
+    if (is_send) {
+      obj_send_vol[obj] += volume;
+    } else {
+      obj_recv_vol[obj] += volume;
+    }
+  }
+
   template <typename SerializerT>
   void serialize(SerializerT& s) {
-    s | load | bytes | intra_send_vol | intra_recv_vol;
-    s | inter_send_vol | inter_recv_vol;
+    s | load | shared_id | bytes | intra_send_vol | intra_recv_vol;
+    s | inter_cluster_send_vol | inter_cluster_recv_vol;
+    s | obj_send_vol | obj_recv_vol;
     s | home_node | edge_weight;
     s | max_object_working_bytes;
     s | max_object_working_bytes_outside;
@@ -86,13 +114,17 @@ struct NodeInfo {
   double inter_send_vol = 0, inter_recv_vol = 0;
   double intra_send_vol = 0, intra_recv_vol = 0;
   double shared_vol = 0;
+  std::set<SharedIDType> shared_ids;
+  std::set<elm::ElementIDStruct> non_cluster_objs;
 
   template <typename SerializerT>
   void serialize(SerializerT& s) {
     s | load | work;
     s | inter_send_vol | inter_recv_vol;
     s | intra_send_vol | intra_recv_vol;
     s | shared_vol;
+    s | shared_ids;
+    s | non_cluster_objs;
   }
 };