handle TAG more correctly

even though currently MPI_ANY_TAG is the same in ABI and OMPI

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

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -573,12 +573,21 @@ def type_text(self, enable_count=False):
         return 'int'
 
 
-@Type.add_type('TAG')
+@Type.add_type('TAG', abi_type=['ompi'])
 class TypeRank(Type):
 
     def type_text(self, enable_count=False):
         return 'int'
 
+@Type.add_type('TAG', abi_type=['standard'])
+class TypeRank(StandardABIType):
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.TAG}({self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int'
 
 @Type.add_type('COMM', abi_type=['ompi'])
 class TypeCommunicator(Type):

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -279,6 +279,7 @@ class ConvertFuncs:
     INFO = 'ompi_convert_abi_info_intern_info'
     FILE = 'ompi_convert_abi_file_intern_file'
     TS_LEVEL = 'ompi_convert_abi_ts_level_intern_ts_level'
+    TAG = 'ompi_convert_abi_tag_intern_tag'
 
 
 class ConvertOMPIToStandard:

ompi/mpi/c/abi_converters.h

@@ -981,6 +981,15 @@ __opal_attribute_always_inline__ static inline int ompi_convert_ts_level_ompi_to
     return ts_level;
 }
 
+__opal_attribute_always_inline__ static inline int ompi_convert_abi_tag_intern_tag(int tag)
+{
+    if (MPI_ANY_TAG_ABI_INTERNAL == tag) {
+        return MPI_ANY_TAG;
+    } else {
+        return tag;
+    }
+}
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif

ompi/mpi/c/improbe.c.in

@@ -25,7 +25,7 @@
 #include "ompi/request/request.h"
 #include "ompi/message/message.h"
 
-PROTOTYPE ERROR_CLASS improbe(INT source, INT tag, COMM comm, INT_OUT flag,
+PROTOTYPE ERROR_CLASS improbe(INT source, TAG tag, COMM comm, INT_OUT flag,
                               MESSAGE_OUT message, STATUS_OUT status)
 {
     int rc;

ompi/mpi/c/iprobe.c.in

@@ -31,7 +31,7 @@
 #include "ompi/request/request.h"
 #include "ompi/runtime/ompi_spc.h"
 
-PROTOTYPE ERROR_CLASS iprobe(INT source, INT tag, COMM comm, INT_OUT flag, STATUS_OUT status)
+PROTOTYPE ERROR_CLASS iprobe(INT source, TAG tag, COMM comm, INT_OUT flag, STATUS_OUT status)
 {
     int rc;
 

ompi/mpi/c/irecv.c.in

@@ -33,7 +33,7 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS irecv(BUFFER_OUT buf, COUNT count, DATATYPE type,
-                            INT source, INT tag, COMM comm, REQUEST_INOUT request)
+                            INT source, TAG tag, COMM comm, REQUEST_INOUT request)
 {
     int rc = MPI_SUCCESS;
 

ompi/mpi/c/irsend.c.in

@@ -37,7 +37,7 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS Irsend(BUFFER buf, COUNT count, DATATYPE type, INT dest,
-               INT tag, COMM comm, REQUEST_INOUT request)
+               TAG tag, COMM comm, REQUEST_INOUT request)
 {
     int rc;
 

ompi/mpi/c/isendrecv.c.in

@@ -39,7 +39,7 @@
 
 PROTOTYPE ERROR_CLASS isendrecv(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
                                 INT dest, INT sendtag, BUFFER_OUT recvbuf, COUNT recvcount,
-                                DATATYPE recvtype, INT source, INT recvtag,
+                                DATATYPE recvtype, INT source, TAG recvtag,
                                 COMM comm,  REQUEST_INOUT request)
 {
     int rc = MPI_SUCCESS;

ompi/mpi/c/isendrecv_replace.c.in

@@ -106,7 +106,7 @@ static int ompi_isendrecv_replace_complete_func (ompi_comm_request_t *request)
 }
 
 PROTOTYPE ERROR_CLASS isendrecv_replace(BUFFER_OUT buf, COUNT count, DATATYPE datatype,
-                                        INT dest, INT sendtag, INT source, INT recvtag,
+                                        INT dest, INT sendtag, INT source, TAG recvtag,
                                         COMM comm, REQUEST_INOUT request)
 {
     int rc = MPI_SUCCESS;

ompi/mpi/c/mprobe.c.in

@@ -27,7 +27,7 @@
 #include "ompi/request/request.h"
 #include "ompi/message/message.h"
 
-PROTOTYPE ERROR_CLASS mprobe(INT source, INT tag, COMM comm,
+PROTOTYPE ERROR_CLASS mprobe(INT source, TAG tag, COMM comm,
                              MESSAGE_OUT message, STATUS_OUT status)
 {
     int rc;