Rework count & datatype mismatch checks for reductions

mpi4py · Jun 6, 2016 · fccb7fb · fccb7fb
1 parent 0c17c29
commit fccb7fb
Showing 1 changed file with 24 additions and 25 deletions.
diff --git a/src/MPI/msgbuffer.pxi b/src/MPI/msgbuffer.pxi
@@ -704,15 +704,14 @@ cdef class _p_msg_cco:
         else:
             self.for_cro_send(smsg, 0)
         # check counts and datatypes
-        if (self.sbuf   != MPI_IN_PLACE and
-            self.scount != self.rcount):
-            raise ValueError(
-                "mismatch in send count %d and receive count %d" %
-                (self.scount, self.rcount))
-        if (self.sbuf  != MPI_IN_PLACE and
-            self.stype != self.rtype):
-            raise ValueError(
-                "mismatch in send and receive MPI datatypes")
+        if self.sbuf != MPI_IN_PLACE:
+            if self.stype != self.rtype:
+                raise ValueError(
+                    "mismatch in send and receive MPI datatypes")
+            if self.scount != self.rcount:
+                raise ValueError(
+                    "mismatch in send count %d and receive count %d" %
+                    (self.scount, self.rcount))
         return 0
 
     cdef int for_reduce_scatter_block(self,
@@ -798,15 +797,14 @@ cdef class _p_msg_cco:
         else:
             self.for_cro_send(smsg, 0)
         # check counts and datatypes
-        if (self.sbuf   != MPI_IN_PLACE and
-            self.scount != self.rcount):
-            raise ValueError(
-                "mismatch in send count %d and receive count %d" %
-                (self.scount, self.rcount))
-        if (self.sbuf  != MPI_IN_PLACE and
-            self.stype != self.rtype):
-            raise ValueError(
-                "mismatch in send and receive MPI datatypes")
+        if self.sbuf != MPI_IN_PLACE:
+            if self.stype != self.rtype:
+                raise ValueError(
+                    "mismatch in send and receive MPI datatypes")
+            if self.scount != self.rcount:
+                raise ValueError(
+                    "mismatch in send count %d and receive count %d" %
+                    (self.scount, self.rcount))
         return 0
 
     cdef int for_exscan(self,
@@ -822,13 +820,14 @@ cdef class _p_msg_cco:
         else:
             self.for_cro_send(smsg, 0)
         # check counts and datatypes
-        if self.scount != self.rcount:
-            raise ValueError(
-                "mismatch in send count %d and receive count %d" %
-                (self.scount, self.rcount))
-        if self.stype != self.rtype:
-            raise ValueError(
-                "mismatch in send and receive MPI datatypes")
+        if self.sbuf != MPI_IN_PLACE:
+            if self.stype != self.rtype:
+                raise ValueError(
+                    "mismatch in send and receive MPI datatypes")
+            if self.scount != self.rcount:
+                raise ValueError(
+                    "mismatch in send count %d and receive count %d" %
+                    (self.scount, self.rcount))
         return 0