From a518499ffaa149a76f6dd299d49c9b581876500c Mon Sep 17 00:00:00 2001
From: Jakub Domagala <domagala.jacob@gmail.com>
Date: Fri, 22 Jan 2021 03:22:38 +0100
Subject: [PATCH] #883 Test commit

---
 src/vt/messaging/active.cc                 | 4 ----
 tests/unit/active/test_active_bcast_put.cc | 4 +---
 tutorial/tutorial_1e.h                     | 4 ++--
 tutorial/tutorial_1f.h                     | 6 ++++--
 tutorial/tutorial_1h.h                     | 4 ++++
 tutorial/tutorial_main.h                   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
index b5caadd1f8..e47fd39b63 100644
--- a/src/vt/messaging/active.cc
+++ b/src/vt/messaging/active.cc
@@ -386,10 +386,6 @@ EventType ActiveMessenger::sendMsgBytes(
     );
   }
 
-  vtWarnIf(
-    !(dest != theContext()->getNode() || is_bcast),
-    "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
index aec1461539..ff3da48a0b 100644
--- 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/tutorial/tutorial_1e.h b/tutorial/tutorial_1e.h
index 4551bcb495..188e8153d9 100644
--- a/tutorial/tutorial_1e.h
+++ b/tutorial/tutorial_1e.h
@@ -75,8 +75,8 @@ static inline void activeMessageGroupRoot() {
     // list of nodes. The lambda is executed once the group is created. By
     // setting the group in the envelope of the message and broadcasting the
     // message will arrive on the set of nodes included in the group
-    auto id = theGroup()->newGroup(std::move(range), [](GroupType group_id){
-      fmt::print("Group is created: id={:x}\n", group_id);
+    auto id = theGroup()->newGroup(std::move(range), [this_node](GroupType group_id){
+      fmt::print("{}: Rooted Group is created: id={:x}\n", this_node, group_id);
       auto msg = makeMessage<MySimpleMsg>();
       envelopeSetGroup(msg->env, group_id);
       theMsg()->broadcastMsg<MySimpleMsg,msgHandlerGroupA>(msg);
diff --git a/tutorial/tutorial_1f.h b/tutorial/tutorial_1f.h
index f71be6b9cc..28ca5c1b2e 100644
--- a/tutorial/tutorial_1f.h
+++ b/tutorial/tutorial_1f.h
@@ -74,11 +74,12 @@ static inline void activeMessageGroupCollective() {
    * spanning tree based on the filter and rebalance it depending on outcomes.
    */
 
+  fmt::print("{}: activeMessageGroupCollective start\n", this_node);
   auto const& is_even_node = this_node % 2 == 0;
 
   auto group = theGroup()->newGroupCollective(
-    is_even_node, [](GroupType group_id){
-      fmt::print("Group is created: id={:x}\n", group_id);
+    is_even_node, [this_node](GroupType group_id){
+      fmt::print("{}: Colective Group is created: id={:x}\n", this_node, group_id);
 
       // In this example, node 1 broadcasts to the group of even nodes
       auto const my_node = ::vt::theContext()->getNode();
@@ -89,6 +90,7 @@ static inline void activeMessageGroupCollective() {
       }
     }
   );
+  fmt::print("{}: activeMessageGroupCollective end\n", this_node);
   (void)group;  // don't warn about unused variable
 }
 
diff --git a/tutorial/tutorial_1h.h b/tutorial/tutorial_1h.h
index 3051bf6414..d8dcaefb1e 100644
--- a/tutorial/tutorial_1h.h
+++ b/tutorial/tutorial_1h.h
@@ -85,6 +85,8 @@ static inline void activeMessageReduce() {
 
   NodeType const root_reduce_node = 0;
 
+  fmt::print("{}: activeMessageReduce start\n", this_node);
+
   auto reduce_msg = ::vt::makeMessage<ReduceDataMsg>();
 
   // Get a reference to the value to set it in this reduce msg
@@ -94,6 +96,8 @@ static inline void activeMessageReduce() {
   default_proxy.reduceMsg<ReduceOp, ReduceResult>(
     root_reduce_node, reduce_msg.get()
   );
+
+  fmt::print("{}: activeMessageReduce end\n", this_node);
 }
 /// [Tutorial1H]
 
diff --git a/tutorial/tutorial_main.h b/tutorial/tutorial_main.h
index 149b72b106..6c72444851 100644
--- a/tutorial/tutorial_main.h
+++ b/tutorial/tutorial_main.h
@@ -92,7 +92,7 @@ int main(int argc, char** argv) {
     activeMessageSerialization();
 
     // Invoke tutorial 1d: active message broadcast
-    activeMessageBroadcast();
+    //activeMessageBroadcast();
 
     // Invoke tutorial 1e: active message group rooted
     activeMessageGroupRoot();