add support for distrib array and order

for subarray type datatype constructors

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

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c.py

@@ -525,6 +525,12 @@ def generate_comm_split_type_convert_fn(self):
     def generate_weight_convert_fn(self):
         self.generic_convert(ConvertFuncs.WEIGHTS, 'weights', 'int *', consts.RESERVED_WEIGHTS)
 
+    def generate_subarray_order_convert_fn(self):
+        self.generic_convert(ConvertFuncs.SUBARRAY_ORDER, 'order', 'int', consts.SUBARRAY_ORDER_TYPES)
+
+    def generate_subarray_distrib_types_convert_fn(self):
+        self.generic_convert(ConvertFuncs.SUBARRAY_DISTRIB_TYPES, 'dist', 'int', consts.SUBARRAY_DISTRIB_TYPES)
+
     def generate_pointer_convert_fn(self, type_, fn_name, constants):
         abi_type = self.mangle_name(type_)
         self.dump(f'{consts.INLINE_ATTRS} void {fn_name}({abi_type} *ptr)')
@@ -677,6 +683,8 @@ def dump_code(self):
         self.generate_win_delete_attr_convert_fn()
         self.generate_comm_split_type_convert_fn()
         self.generate_weight_convert_fn()
+        self.generate_subarray_order_convert_fn()
+        self.generate_subarray_distrib_types_convert_fn()
 
         #
         # the following only need intern to abi converters

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -2578,6 +2578,22 @@ def init_code(self):
     def type_text(self, enable_count=False):
         return 'int'
 
+@Type.add_type('SUBARRAY_ORDER', abi_type=['ompi'])
+class TypeSubarrayOrderType(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('SUBARRAY_ORDER', abi_type=['standard'])
+class TyperSubArraOrderStandard(StandardABIType):
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.SUBARRAY_ORDER}({self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
 @Type.add_type('WEIGHTS', abi_type=['ompi'])
 class TypeWeightType(Type):
 
@@ -2647,3 +2663,42 @@ def type_text(self, enable_count=False):
     @property
     def argument(self):
         return f'(MPI_T_event_instance){self.name}'
+
+@Type.add_type('DISTRIB_ARRAY', abi_type=['ompi'])
+class TypeDistributionArray(Type):
+
+    def type_text(self, enable_count=False):
+        return 'const int *'
+
+    def parameter(self, enable_count=False, **kwargs):
+        return f'const int {self.name}[]'
+
+@Type.add_type('DISTRIB_ARRAY', abi_type=['standard'])
+class TypeDistributioneArrayStandard(StandardABIType):
+
+    @property
+    def init_code(self):
+        code = [f'int size_{self.tmpname} = {self.count_param};']
+        code.append(f'int *{self.tmpname} = NULL;')
+        code.append('if('+f'{self.name}' + '!= NULL)' + '{')
+        code.append(f'{self.tmpname} = (int *)malloc(sizeof(int) * size_{self.tmpname});')
+        code.append(f'for(int i=0;i<size_{self.tmpname};i++){{')
+        code.append(f'{self.tmpname}[i] = {ConvertFuncs.SUBARRAY_DISTRIB_TYPES}({self.name}[i]);')
+        code.append(f'}}')
+        code.append(f'}}')
+        return code
+
+    @property
+    def final_code(self):
+        code = [f'if({self.tmpname} != NULL){{']
+        code.append(f'free({self.tmpname});')
+        code.append('}')
+        return code
+
+    def type_text(self, enable_count=False):
+        return 'const int *'
+
+    def parameter(self, enable_count=False, **kwargs):
+        return f'const int {self.name}[]'
+
+

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -188,6 +188,18 @@
     'MPI_COMM_TYPE_RESOURCE_GUIDED',
 ]
 
+SUBARRAY_ORDER_TYPES = [
+    'MPI_ORDER_C',
+    'MPI_ORDER_FORTRAN',
+]
+
+SUBARRAY_DISTRIB_TYPES = [
+    'MPI_DISTRIBUTE_NONE',
+    'MPI_DISTRIBUTE_BLOCK',
+    'MPI_DISTRIBUTE_CYCLIC',
+    'MPI_DISTRIBUTE_DFLT_DARG',
+]
+
 RESERVED_GROUPS = [
     'MPI_GROUP_NULL',
 ]
@@ -497,7 +509,8 @@ class ConvertFuncs:
     WIN_DELETE_ATTR_FUNCTION = 'ompi_convert_win_delete_attr_fn_intern_win_delete_attr_fn'
     SPLIT_TYPE = 'ompi_convert_split_type_intern_type'
     WEIGHTS = 'ompi_convert_weight_intern_weight'
-
+    SUBARRAY_ORDER = 'ompi_convert_subarray_order_intern_subarray_order'
+    SUBARRAY_DISTRIB_TYPES = 'ompi_convert_subarray_distrib_type_intern_distrib_type'
 
 class ConvertOMPIToStandard:
     """Generated function for converting from OMPI to standard ABI."""
@@ -528,6 +541,7 @@ class ConvertOMPIToStandard:
     ATTR_KEY = 'ompi_convert_attr_key_ompi_to_standard'
     COMM_CMP = 'ompi_convert_comm_cmp_ompi_to_standard'
     SOURCE = 'ompi_convert_source_ompi_to_standard'
+    SUBARRAY_ORDER = 'ompi_convert_subarray_order_ompi_to_standard'
 
 
 # Inline function attributes

ompi/mpi/c/type_create_darray.c.in

@@ -43,10 +43,10 @@ PROTOTYPE ERROR_CLASS type_create_darray(INT size,
                                          INT rank,
                                          INT ndims,
                                          COUNT_ARRAY gsize_array,
-                                         INT_ARRAY distrib_array,
+                                         DISTRIB_ARRAY distrib_array:ndims,
                                          INT_ARRAY darg_array,
                                          INT_ARRAY psize_array,
-                                         INT order,
+                                         SUBARRAY_ORDER order,
                                          DATATYPE oldtype,
                                          DATATYPE_OUT newtype)
 {