add support for comm topos

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

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c.py

@@ -546,6 +546,9 @@ def generate_typeclass_convert_fn(self):
     def generate_win_lock_convert_fn(self):
         self.generic_convert(ConvertFuncs.WIN_LOCK, 'lock_assert', 'int', consts.WIN_LOCK_VALUES)
 
+    def generate_topo_convert_fn_intern_to_abi(self):
+        self.generic_convert_reverse(ConvertOMPIToStandard.TOPO, 'status', 'int', consts.TOPO_VALUES)
+
     def generate_mode_bits_convert_fn(self):
         self.dump(f'{consts.INLINE_ATTRS} int {ConvertFuncs.MODE_BITS}(int mode_bits)')
         self.dump('{')
@@ -741,6 +744,7 @@ def dump_code(self):
         #
         self.generate_comm_cmp_convert_fn_intern_to_abi()
         self.generate_combiner_convert_fn_intern_to_abi()
+        self.generate_topo_convert_fn_intern_to_abi()
 
         self.dump("""
 #if defined(c_plusplus) || defined(__cplusplus)

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -2884,3 +2884,24 @@ def init_code(self):
     def type_text(self, enable_count=False):
         return 'int'
 
+@Type.add_type('TOPO_OUT', abi_type=['ompi'])
+class TopoOut(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+@Type.add_type('TOPO_OUT', abi_type=['standard'])
+class TopoOutStandard(StandardABIType):
+
+    @property
+    def final_code(self):
+        return [f'if (NULL != {self.name}) *{self.name} = {ConvertOMPIToStandard.TOPO}(*{self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+    @property
+    def argument(self):
+        return f'{self.name}'
+
+

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -493,6 +493,12 @@
     'MPI_LOCK_SHARED',
 ]
 
+TOPO_VALUES = [
+    'MPI_CART',
+    'MPI_GRAPH',
+    'MPI_DIST_GRAPH',
+]
+
 # Types
 
 C_OPAQUE_TYPES = {
@@ -603,6 +609,7 @@ class ConvertOMPIToStandard:
     SUBARRAY_ORDER = 'ompi_convert_subarray_order_ompi_to_standard'
     MODE_BITS = 'ompi_convert_mode_bits_to_standard'
     COMBINER = 'ompi_convert_combiner_to_standard'
+    TOPO = 'ompi_convert_topo_to_standard'
 
 
 # Inline function attributes

ompi/mpi/c/topo_test.c.in

@@ -29,7 +29,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/memchecker.h"
 
-PROTOTYPE ERROR_CLASS topo_test(COMM comm, INT_OUT status)
+PROTOTYPE ERROR_CLASS topo_test(COMM comm, TOPO_OUT status)
 {
     MEMCHECKER(
         memchecker_comm(comm);