handle dargs for darray_create correctly

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/c.py

@@ -537,6 +537,9 @@ def generate_subarray_order_convert_fn(self):
     def generate_subarray_distrib_types_convert_fn(self):
         self.generic_convert(ConvertFuncs.SUBARRAY_DISTRIB_TYPES, 'dist', 'int', consts.SUBARRAY_DISTRIB_TYPES)
 
+    def generate_subarray_dargs_types_convert_fn(self):
+        self.generic_convert(ConvertFuncs.SUBARRAY_DARGS_TYPES, 'darg', 'int', consts.SUBARRAY_DARGS_TYPES)
+
     def generate_whence_convert_fn(self):
         self.generic_convert(ConvertFuncs.WHENCE, 'whence', 'int', consts.WHENCE_VALUES)
 
@@ -786,6 +789,7 @@ def dump_code(self):
         self.generate_weight_convert_fn()
         self.generate_subarray_order_convert_fn()
         self.generate_subarray_distrib_types_convert_fn()
+        self.generate_subarray_dargs_types_convert_fn()
         self.generate_root_convert_fn()
         self.generate_t_cb_safety_convert_fn()
         self.generate_win_lock_convert_fn()

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -3202,6 +3202,46 @@ def type_text(self, enable_count=False):
     def parameter(self, enable_count=False, **kwargs):
         return f'const int {self.name}[]'
 
+@Type.add_type('DARGS_ARRAY', abi_type=['ompi'])
+class TypeDargsArray(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('DARGS_ARRAY', abi_type=['standard'])
+class TypeDargsArrayStandard(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 *)ompi_abi_malloc(size_{self.tmpname}, sizeof(int));')
+        code.append(f'if (NULL != {self.tmpname}){{')
+        code.append(f'for(int i=0;i<size_{self.tmpname};i++){{')
+        code.append(f'{self.tmpname}[i] = {ConvertFuncs.SUBARRAY_DARGS_TYPES}({self.name}[i]);')
+        code.append('}')
+        code.append('}')
+        code.append('}')
+        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}[]'
+
 @Type.add_type('MODE_BITS', abi_type=['ompi'])
 class TypeModeBits(Type):
 

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -200,6 +200,9 @@
     'MPI_DISTRIBUTE_NONE',
     'MPI_DISTRIBUTE_BLOCK',
     'MPI_DISTRIBUTE_CYCLIC',
+]
+
+SUBARRAY_DARGS_TYPES = [
     'MPI_DISTRIBUTE_DFLT_DARG',
 ]
 
@@ -581,6 +584,7 @@ class ConvertFuncs:
     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'
+    SUBARRAY_DARGS_TYPES = 'ompi_convert_subarray_dargs_type_intern_dargs_type'
     MODE_BITS = 'ompi_convert_mode_bits_intern_mode_bits'
     RMA_MODE_BITS = 'ompi_convert_rma_mode_bits_intern_mode_bits'
     WHENCE = 'ompi_convert_whence_intern_whence'

ompi/mpi/c/type_create_darray.c.in

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