#1328: Fix failing tests on single rank, where enqueued Runnables wou…

…ld not produce to collective epoch resulting in premature epoch termination
DARMA-tasking · Mar 29, 2021 · cf18bb0 · cf18bb0
1 parent 47470a8
commit cf18bb0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/vt/collective/reduce/reduce.impl.h b/src/vt/collective/reduce/reduce.impl.h
@@ -82,7 +82,7 @@ void Reduce::reduceRootRecv(MsgT* msg) {
 
   auto m = promoteMsg(msg);
   runnable::makeRunnable(m, false, handler, from_node)
-    .withTDEpochFromMsg()
+    .withTDEpoch(theMsg()->getEpoch())
     .run();
 }
 

diff --git a/src/vt/pipe/callback/handler_send/callback_send.impl.h b/src/vt/pipe/callback/handler_send/callback_send.impl.h
@@ -112,7 +112,7 @@ CallbackSend<MsgT>::triggerDispatch(SignalDataType* data, PipeType const& pid) {
     auto msg = reinterpret_cast<ShortMessage*>(data);
     auto m = promoteMsg(msg);
     runnable::makeRunnable(m, true, handler_, this_node)
-      .withTDEpochFromMsg()
+      .withTDEpoch(theMsg()->getEpoch())
       .enqueue();
   } else {
     theMsg()->sendMsg<SignalDataType>(send_node_, handler_, data);

diff --git a/src/vt/pipe/callback/handler_send/callback_send_tl.impl.h b/src/vt/pipe/callback/handler_send/callback_send_tl.impl.h
@@ -73,7 +73,7 @@ void CallbackSendTypeless::trigger(MsgT* msg, PipeType const& pipe) {
   auto pmsg = promoteMsg(msg);
   if (this_node == send_node_) {
     runnable::makeRunnable(pmsg, true, handler_, this_node)
-      .withTDEpochFromMsg()
+      .withTDEpoch(theMsg()->getEpoch())
       .enqueue();
   } else {
     theMsg()->sendMsg<MsgT>(send_node_, handler_, pmsg);

diff --git a/tests/unit/pipe/test_callback_send.cc b/tests/unit/pipe/test_callback_send.cc
@@ -114,7 +114,7 @@ TEST_F(TestCallbackSend, test_callback_send_1) {
 
   called = 0;
 
-  runInEpochCollective([this_node]{
+  runInEpochRooted([this_node]{
     auto cb = theCB()->makeSend<DataMsg, callbackFn>(this_node);
     cb.send(1, 2, 3);
   });
@@ -126,7 +126,7 @@ TEST_F(TestCallbackSend, test_callback_send_2) {
   auto const& this_node = theContext()->getNode();
   called = 0;
 
-  runInEpochCollective([this_node]{
+  runInEpochRooted([this_node]{
     auto cb = theCB()->makeSend<CallbackFunctor>(this_node);
     cb.send(1, 2, 3);
   });
@@ -138,7 +138,7 @@ TEST_F(TestCallbackSend, test_callback_send_3) {
   auto const& this_node = theContext()->getNode();
   called = 0;
 
-  runInEpochCollective([this_node]{
+  runInEpochRooted([this_node]{
     auto cb = theCB()->makeSend<CallbackFunctorEmpty>(this_node);
     cb.send();
   });