add better support for MPI_ROOT and source

since MPI_ROOT for ABI is not equal to ompi.
MPI_ANY_SOURCE is but still generate conversion code
rather than just beining lucky.

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

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024      Triad National Security, LLC. All rights
+# Copyright (c) 2024-2025 Triad National Security, LLC. All rights
 #                         reserved.
 #
 # $COPYRIGHT$
@@ -580,7 +580,7 @@ def type_text(self, enable_count=False):
         return 'int'
 
 @Type.add_type('TAG', abi_type=['standard'])
-class TypeRank(StandardABIType):
+class TypeRankStandard(StandardABIType):
 
     @property
     def init_code(self):
@@ -589,6 +589,38 @@ def init_code(self):
     def type_text(self, enable_count=False):
         return 'int'
 
+@Type.add_type('ROOT', abi_type=['ompi'])
+class TypeRoot(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('ROOT', abi_type=['standard'])
+class TypeRootStandard(StandardABIType):
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.ROOT}({self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('SOURCE', abi_type=['ompi'])
+class TypeSource(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('SOURCE', abi_type=['standard'])
+class TypeSourceStandard(StandardABIType):
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.SOURCE}({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

@@ -280,6 +280,8 @@ class ConvertFuncs:
     FILE = 'ompi_convert_abi_file_intern_file'
     TS_LEVEL = 'ompi_convert_abi_ts_level_intern_ts_level'
     TAG = 'ompi_convert_abi_tag_intern_tag'
+    ROOT = 'ompi_convert_abi_root_intern_root'
+    SOURCE = 'ompi_convert_abi_source_intern_source'
 
 
 class ConvertOMPIToStandard:

ompi/mpi/c/abi_converters.h

@@ -999,6 +999,24 @@ __opal_attribute_always_inline__ static inline int ompi_convert_tag_ompi_to_star
     }
 }
 
+__opal_attribute_always_inline__ static inline int ompi_convert_abi_root_intern_root(int root)
+{
+    if (MPI_ROOT_ABI_INTERNAL == root) {
+        return MPI_ROOT;
+    } else {
+        return root;
+    }
+}
+
+__opal_attribute_always_inline__ static inline int ompi_convert_abi_source_intern_source(int source)
+{
+    if (MPI_ANY_SOURCE_ABI_INTERNAL == source) {
+        return MPI_ANY_SOURCE;
+    } else {
+        return source;
+    }
+}
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif

ompi/mpi/c/bcast.c.in

@@ -32,7 +32,7 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS bcast(BUFFER_OUT buffer, COUNT count, DATATYPE datatype,
-                            INT root, COMM comm)
+                            ROOT root, COMM comm)
 {
     int err;
 

ompi/mpi/c/bcast_init.c.in

@@ -26,7 +26,7 @@
 #include "ompi/runtime/ompi_spc.h"
 
 PROTOTYPE ERROR_CLASS bcast_init(BUFFER_OUT buffer, COUNT count, DATATYPE datatype,
-                                 INT root, COMM comm, INFO info, REQUEST_INOUT request)
+                                 ROOT root, COMM comm, INFO info, REQUEST_INOUT request)
 {
     int err;
 

ompi/mpi/c/comm_accept.c.in

@@ -39,7 +39,7 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS comm_accept(STRING port_name, INFO info, INT root,
+PROTOTYPE ERROR_CLASS comm_accept(STRING port_name, INFO info, ROOT root,
                                   COMM comm, COMM_OUT newcomm)
 {
     int rank, rc;

ompi/mpi/c/comm_connect.c.in

@@ -39,7 +39,7 @@
 #include "ompi/dpm/dpm.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS comm_connect(STRING port_name, INFO info, INT root,
+PROTOTYPE ERROR_CLASS comm_connect(STRING port_name, INFO info, ROOT root,
                                    COMM comm, COMM_OUT newcomm)
 {
     int rank, rc;

ompi/mpi/c/comm_spawn.c.in

@@ -42,7 +42,7 @@
 #include "ompi/memchecker.h"
 
 PROTOTYPE ERROR_CLASS comm_spawn(STRING command, STRING_ARRAY argv, INT maxprocs, INFO info,
-                                 INT root, COMM comm, COMM_OUT intercomm,
+                                 ROOT root, COMM comm, COMM_OUT intercomm,
                                  INT_OUT array_of_errcodes)
 {
     int rank, rc=OMPI_SUCCESS, i, flag;

ompi/mpi/c/comm_spawn_multiple.c.in

@@ -43,7 +43,7 @@
 
 PROTOTYPE ERROR_CLASS comm_spawn_multiple(INT count, STRING_ARRAY array_of_commands, ARGV array_of_argv,
                                           INT_ARRAY array_of_maxprocs, INFO_ARRAY array_of_info:count,
-                                          INT root, COMM comm, COMM_OUT intercomm,
+                                          ROOT root, COMM comm, COMM_OUT intercomm,
                                           INT_OUT array_of_errcodes)
 {
     int i=0, rc=0, rank=0, size=0, flag;

ompi/mpi/c/gather.c.in

@@ -39,7 +39,7 @@
 
 PROTOTYPE ERROR_CLASS gather(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
                              BUFFER_OUT recvbuf, COUNT recvcount, DATATYPE recvtype,
-                             INT root, COMM comm)
+                             ROOT root, COMM comm)
 {
     int err;