remove MPI_Cancel in reductions, substitute with MPI_Wait

JaakkoAnnala · Dec 11, 2024 · 8220485 · 8220485
1 parent fa0afa1
commit 8220485
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/libraries/plumbing/reduction.h b/libraries/plumbing/reduction.h
@@ -121,9 +121,7 @@ class Reduction {
 
     /// Destructor cleans up communications if they are in progress
     ~Reduction() {
-        if (comm_is_on) {
-            MPI_Cancel(&request);
-        }
+        wait();
     }
 
     /// allreduce(bool) turns allreduce on or off.  By default on.
@@ -169,8 +167,7 @@ class Reduction {
     /// Assignment is used only outside site loops - drop comms if on, no need to wait
     template <typename S, std::enable_if_t<hila::is_assignable<T &, S>::value, int> = 0>
     T operator=(const S &rhs) {
-        if (comm_is_on)
-            MPI_Cancel(&request);
+        wait();
 
         comm_is_on = false;
         T ret = rhs;

diff --git a/libraries/plumbing/reductionvector.h b/libraries/plumbing/reductionvector.h
@@ -137,9 +137,7 @@ class ReductionVector {
 
     /// Destructor cleans up communications if they are in progress
     ~ReductionVector() {
-        if (comm_is_on) {
-            MPI_Cancel(&request);
-        }
+        wait();
     }
 
     /// And access operators - these do in practice everything already!