#883: active: Remove the warn when sending data to current node

DARMA-tasking · Feb 23, 2021 · 767492d · 767492d
1 parent 441d45b
commit 767492d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
@@ -186,6 +186,7 @@ EventType ActiveMessenger::sendMsgBytesWithPut(
   auto const& is_term = envelopeIsTerm(msg->env);
   auto const& is_put = envelopeIsPut(msg->env);
   auto const& is_put_packed = envelopeIsPackedPutType(msg->env);
+  auto const& is_bcast = envelopeIsBcast(msg->env);
 
   if (!is_term || vt_check_enabled(print_term_msgs)) {
     vt_debug_print(
@@ -195,6 +196,11 @@ EventType ActiveMessenger::sendMsgBytesWithPut(
     );
   }
 
+  vtWarnIf(
+    !(dest != theContext()->getNode() || is_bcast),
+    "Destination {} should != this node"
+  );
+
   MsgSizeType new_msg_size = msg_size;
 
   if (is_put && !is_put_packed) {
@@ -388,10 +394,6 @@ EventType ActiveMessenger::sendMsgBytes(
     );
   }
 
-  vtWarnIf(
-    !(dest != theContext()->getNode() || is_bcast),
-    "Destination {} should != this node"
-  );
   vtAbortIf(
     dest >= theContext()->getNumNodes() || dest < 0, "Invalid destination: {}"
   );
@@ -520,10 +522,6 @@ SendInfo ActiveMessenger::sendData(
     data_ptr, num_bytes, dest, tag, send_tag
   );
 
-  vtWarnIf(
-    dest == theContext()->getNode(),
-    "Destination {} should != this node"
-  );
   vtAbortIf(
     dest >= theContext()->getNumNodes() || dest < 0,
     "Invalid destination: {}"

diff --git a/tests/unit/active/test_active_bcast_put.cc b/tests/unit/active/test_active_bcast_put.cc
@@ -131,9 +131,7 @@ TEST_P(TestActiveBroadcastPut, test_type_safe_active_fn_bcast2) {
       }
     });
 
-    if (my_node != root) {
-      ASSERT_TRUE(handler_count == num_msg_sent);
-    }
+    ASSERT_TRUE(handler_count == num_msg_sent);
   }
 
   // Spin here so test_vec does not go out of scope before the send completes

diff --git a/tests/unit/active/test_active_broadcast.cc b/tests/unit/active/test_active_broadcast.cc
@@ -109,9 +109,7 @@ TEST_P(TestActiveBroadcast, test_type_safe_active_fn_bcast2) {
       }
     });
 
-    if (my_node != root) {
-      ASSERT_TRUE(handler_count == num_msg_sent);
-    }
+    ASSERT_TRUE(handler_count == num_msg_sent);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         });
-        if (my_node != root) {
-          ASSERT_TRUE(handler_count == num_msg_sent);
-        }
+        ASSERT_TRUE(handler_count == num_msg_sent);
       }
     }
@@ Expand Down @@