temporary WAR for non-blocking alltoallw

variants.

We'll need to append the temporary arrays holding
translated datatype handles to the nbc request for
cleanup after the non-blocking op is completed or
the persistent request has been freed.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -497,6 +497,14 @@ def type_text(self, enable_count=False):
     def parameter(self, enable_count=False, **kwargs):
         return f'{self.type_text(enable_count=enable_count)} {self.name}[]'
 
+@Type.add_type('DATATYPE_ARRAY_ASYNC', abi_type=['ompi'])
+class TypeDatatypeArray(Type):
+
+    def type_text(self, enable_count=False):
+        return 'MPI_Datatype'
+
+    def parameter(self, enable_count=False, **kwargs):
+        return f'const {self.type_text(enable_count=enable_count)} {self.name}[]'
 
 @Type.add_type('DATATYPE', abi_type=['standard'])
 class TypeDatatypeStandard(StandardABIType):
@@ -570,6 +578,16 @@ def parameter(self, enable_count=False, **kwargs):
     def argument(self):
         return f'(MPI_Datatype *) {self.tmpname}'
 
+@Type.add_type('DATATYPE_ARRAY_ASYNC', abi_type=['standard'])
+class TypeDatatypeArrayAsyncStandard(TypeDatatypeArrayStandard):
+
+    @property
+    def final_code(self):
+        code = ['{']
+        code.append('}')
+        return code
+
+
 @Type.add_type('DATATYPE_ARRAY_OUT', abi_type=['standard'])
 class TypeDatatypeArrayOutStandard(StandardABIType):
 

ompi/mpi/c/alltoallw_init.c.in

@@ -37,8 +37,8 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS alltoallw_init(BUFFER sendbuf, COUNT_ARRAY sendcounts, DISP_ARRAY sdispls,
-                                     DATATYPE_ARRAY sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
-                                     DISP_ARRAY rdispls, DATATYPE_ARRAY recvtypes, COMM comm,
+                                     DATATYPE_ARRAY_ASYNC sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
+                                     DISP_ARRAY rdispls, DATATYPE_ARRAY_ASYNC recvtypes, COMM comm,
                                      INFO info, REQUEST_INOUT request)
 {
     int i, size, err;

ompi/mpi/c/ialltoallw.c.in

@@ -37,8 +37,8 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS ialltoallw(BUFFER sendbuf, COUNT_ARRAY sendcounts, DISP_ARRAY sdispls,
-                                 DATATYPE_ARRAY sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
-                                 DISP_ARRAY rdispls, DATATYPE_ARRAY recvtypes, COMM comm,
+                                 DATATYPE_ARRAY_ASYNC sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
+                                 DISP_ARRAY rdispls, DATATYPE_ARRAY_ASYNC recvtypes, COMM comm,
                                  REQUEST_INOUT request)
 {
     int i, size, err;
@@ -121,6 +121,7 @@ PROTOTYPE ERROR_CLASS ialltoallw(BUFFER sendbuf, COUNT_ARRAY sendcounts, DISP_AR
     if (OPAL_LIKELY(OMPI_SUCCESS == err)) {
         ompi_coll_base_retain_datatypes_w(*request, (MPI_IN_PLACE==sendbuf)?NULL:sendtypes, recvtypes, false);
     }
+
     OMPI_ERRHANDLER_RETURN(err, comm, err, FUNC_NAME);
 }
 

ompi/mpi/c/ineighbor_alltoallw.c.in

@@ -40,8 +40,8 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS ineighbor_alltoallw(BUFFER sendbuf, COUNT_ARRAY sendcounts, AINT_ARRAY sdispls,
-                                          DATATYPE_ARRAY sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
-                                          AINT_ARRAY rdispls, DATATYPE_ARRAY recvtypes, COMM comm,
+                                          DATATYPE_ARRAY_ASYNC sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
+                                          AINT_ARRAY rdispls, DATATYPE_ARRAY_ASYNC recvtypes, COMM comm,
                                           REQUEST_INOUT request)
 {
     int i, err;

ompi/mpi/c/neighbor_alltoallw_init.c.in

@@ -40,8 +40,8 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS neighbor_alltoallw_init(BUFFER sendbuf, COUNT_ARRAY sendcounts, AINT_ARRAY sdispls,
-                                              DATATYPE_ARRAY sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
-                                              AINT_ARRAY rdispls, DATATYPE_ARRAY recvtypes, COMM comm,
+                                              DATATYPE_ARRAY_ASYNC sendtypes, BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
+                                              AINT_ARRAY rdispls, DATATYPE_ARRAY_ASYNC recvtypes, COMM comm,
                                               INFO info, REQUEST_INOUT request)
 {
     int i, err;