#1279: gossiplb: fix compile errors

DARMA-tasking · Apr 9, 2021 · 4d38c6a · 4d38c6a
1 parent a0a1c26
commit 4d38c6a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/vt/vrt/collection/balance/gossiplb/gossip_msg.h b/src/vt/vrt/collection/balance/gossiplb/gossip_msg.h
@@ -159,13 +159,27 @@ struct RejectionStats {
   int n_transfers_ = 0;
 };
 
-struct GossipRejectionStatsMsg : collective::ReduceTMsg<RejectionStats> {
+static_assert(
+  vt::messaging::is_byte_copyable_t<RejectionStats>::value,
+  "Must be trivially copyable to avoid serialization."
+);
+
+struct GossipRejectionStatsMsg : NonSerialized<
+  collective::ReduceTMsg<RejectionStats>,
+  GossipRejectionStatsMsg
+>
+{
+  using MessageParentType = NonSerialized<
+    collective::ReduceTMsg<RejectionStats>,
+    GossipRejectionStatsMsg
+  >;
+
   GossipRejectionStatsMsg() = default;
   GossipRejectionStatsMsg(int n_rejected, int n_transfers)
-    : ReduceTMsg<RejectionStats>(RejectionStats(n_rejected, n_transfers))
+    : MessageParentType(RejectionStats(n_rejected, n_transfers))
   { }
   GossipRejectionStatsMsg(RejectionStats&& rs)
-    : ReduceTMsg<RejectionStats>(std::move(rs))
+    : MessageParentType(std::move(rs))
   { }
 };
 

diff --git a/src/vt/vrt/collection/balance/gossiplb/gossiplb.cc b/src/vt/vrt/collection/balance/gossiplb/gossiplb.cc
@@ -224,7 +224,6 @@ void GossipLB::doLBStages(TimeType start_imb) {
 
       if (rollback_ || theConfig()->vt_debug_gossiplb || (iter_ == num_iters_ - 1)) {
         runInEpochCollective([=] {
-          using StatsMsgType = balance::NodeStatsMsg;
           using ReduceOp = collective::PlusOp<balance::LoadData>;
           auto cb = vt::theCB()->makeBcast<
             GossipLB, StatsMsgType, &GossipLB::gossipStatsHandler