checkpoint

many changes.  go back to generating abi_converters.h
fix up tools for abi case, etc.

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

Author: hppritcha

ompi/mpi/bindings/bindings.py

@@ -57,6 +57,8 @@ def main():
     parser_header.add_argument('--external', action='store_true', help='generate external mpi.h header file')
     parser_header.add_argument('--srcdir', help='source directory')
     parser_header.set_defaults(handler=lambda args, out: c.generate_header(args, out))
+    parser_header = subparsers_c.add_parser('converters', help='generate converter header file')
+    parser_header.set_defaults(handler=lambda args, out: c.generate_converters(args, out))
     parser_gen = subparsers_c.add_parser('source', help='generate source file from template file')
     # parser = argparse.ArgumentParser(description='C ABI binding generation code')
     parser_gen.add_argument('type', choices=('ompi', 'standard'),

ompi/mpi/bindings/c_header.py

@@ -256,6 +256,16 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
     output.append("extern int ompi_abi_mpi_proc_null_val;\n")
     output.append("extern int ompi_abi_mpi_any_source_val;\n")
     output.append("\n")
+    output.append("int ABI_C_MPI_COMM_NULL_DELETE_FN( MPI_Comm_ABI_INTERNAL comm, int comm_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_COMM_NULL_COPY_FN( MPI_Comm_ABI_INTERNAL  comm, int comm_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_COMM_DUP_FN( MPI_Comm_ABI_INTERNAL comm, int comm_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_TYPE_NULL_DELETE_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_TYPE_NULL_COPY_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_TYPE_DUP_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_WIN_NULL_DELETE_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_WIN_NULL_COPY_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_WIN_DUP_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("\n")
 
 # ================================ Final Output ================================
 output.append("#if defined(__cplusplus)\n")

ompi/mpi/bindings/ompi_bindings/c.py

@@ -1387,20 +1387,21 @@ def type_text(self, enable_count=False):
 
 
 @Type.add_type('COMM_COPY_ATTR_FUNCTION', abi_type=['standard'])
-class TypeCommCopyAttrFunctionStandard(Type):
+class TypeCommCopyAttrFunctionStandard(StandardABIType):
 
     def type_text(self, enable_count=False):
         type_name = self.mangle_name('MPI_Comm_copy_attr_function')
         return f'{type_name} *'
 
-    @property
-    def argument(self):
-        return f'(MPI_Comm_copy_attr_function *) {self.name}'
+#    @property
+#    def argument(self):
+#        return f'(MPI_Comm_copy_attr_function *) {self.name}'
 
     @property
     def init_code(self):
         code = []
-        code = ['ompi_abi_wrapper_helper_t *helper = NULL;']
+        code = [f'MPI_Comm_copy_attr_function *{self.tmpname} = {ConvertFuncs.COMM_COPY_ATTR_FUNCTION}({self.name});']
+        code.append('ompi_abi_wrapper_helper_t *helper = NULL;')
         code.append('MPI_Comm_copy_attr_function_ABI_INTERNAL *copy_fn;')
         code.append('helper = ( ompi_abi_wrapper_helper_t *)malloc(sizeof(ompi_abi_wrapper_helper_t));')
         code.append('if (NULL == helper)  return MPI_ERR_NO_MEM;')
@@ -1436,7 +1437,6 @@ def callback_wrapper_code(self):
         code.append('    ompi_abi_wrapper_helper_t *helper = (ompi_abi_wrapper_helper_t *)extra_state;')
         code.append('    MPI_Comm_ABI_INTERNAL comm_tmp = ompi_convert_comm_ompi_to_standard(oldcomm);')
         code.append('    return helper->user_delete_fn((MPI_Comm_ABI_INTERNAL)comm_tmp, comm_keyval, attribute_val, helper->user_extra_state);')
-        code.append('    free(helper);')
         code.append('}')
         return code
 
@@ -1448,15 +1448,15 @@ def type_text(self, enable_count=False):
 
 
 @Type.add_type('COMM_DELETE_ATTR_FUNCTION', abi_type=['standard'])
-class TypeCommDeleteAttrFunctionStandard(Type):
+class TypeCommDeleteAttrFunctionStandard(StandardABIType):
 
     def type_text(self, enable_count=False):
         type_name = self.mangle_name('MPI_Comm_delete_attr_function')
         return f'{type_name} *'
 
-    @property
-    def argument(self):
-        return f'(MPI_Comm_delete_attr_function *) {self.name}'
+#    @property
+#    def argument(self):
+#        return f'(MPI_Comm_delete_attr_function *) {self.name}'
 
 #
 # note the code generated here relies on that generated for
@@ -1465,6 +1465,7 @@ def argument(self):
     @property
     def init_code(self):
         code = []
+        code = [f'MPI_Comm_delete_attr_function *{self.tmpname} = {ConvertFuncs.COMM_DELETE_ATTR_FUNCTION}({self.name});']
         code.append('MPI_Comm_delete_attr_function_ABI_INTERNAL *delete_fn;')
         code.append(f'if ({self.name} == MPI_COMM_NULL_DELETE_FN_ABI_INTERNAL)'  + '{')
         code.append('delete_fn = ABI_C_MPI_COMM_NULL_DELETE_FN;')
@@ -2336,7 +2337,7 @@ class TypeCbSafetyStandard(StandardABIType):
 
     @property
     def init_code(self):
-        return [f'MPI_T_cb_safety {self.tmpname} = {ConvertFuncs.CB_SAFETY}({self.name});']
+        return [f'MPI_T_cb_safety {self.tmpname} = {ConvertFuncs.T_CB_SAFETY}({self.name});']
 
     def type_text(self, enable_count=False):
         return self.mangle_name('MPI_T_cb_safety')
@@ -2355,7 +2356,7 @@ class TypeSourceOrderStandard(StandardABIType):
 
     @property
     def init_code(self):
-        return [f'MPI_T_source_order {self.tmpname} = {ConvertFuncs.SOURCE_ORDER}({self.name});']
+        return [f'MPI_T_source_order {self.tmpname} = {ConvertFuncs.T_SOURCE_ORDER}({self.name});']
 
     def type_text(self, enable_count=False):
         return self.mangle_name('MPI_T_source_order')
@@ -2375,7 +2376,7 @@ class TypeSourceOrderOutStandard(StandardABIType):
 
     @property
     def final_code(self):
-        return [f'*{self.name} = {ConvertOMPIToStandard.SOURCE_ORDER}((MPI_T_source_order) {self.name});']
+        return [f'*{self.name} = {ConvertOMPIToStandard.T_SOURCE_ORDER}((MPI_T_source_order) {self.name});']
 
     def type_text(self, enable_count=False):
         type_name = self.mangle_name('MPI_T_source_order')
@@ -2505,3 +2506,58 @@ def type_text(self, enable_count=False):
     def argument(self):
         return f'&{self.tmpname}'
 
+@Type.add_type('SPLIT_TYPE', abi_type=['ompi'])
+class TypeSplitType(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('SPLIT_TYPE', abi_type=['standard'])
+class TyperSplitTypeStandard(StandardABIType):
+
+    @property
+    def init_code(self):
+        return [f'int {self.tmpname} = {ConvertFuncs.SPLIT_TYPE}({self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int'
+
+@Type.add_type('COMM_CMP_OUT', abi_type=['ompi'])
+class TypeCommCmpOut(Type):
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+@Type.add_type('COMM_CMP_OUT', abi_type=['standard'])
+class TyperCommCmpOutStandard(StandardABIType):
+
+    @property
+    def final_code(self):
+        return [f'*{self.name} = {ConvertOMPIToStandard.COMM_CMP}(*{self.name});']
+
+    def type_text(self, enable_count=False):
+        return 'int *'
+
+    @property
+    def argument(self):
+        return f'{self.name}'
+
+@Type.add_type('EVENT_INSTANCE', abi_type=['ompi'])
+class TypeEventInstance(Type):
+
+    def type_text(self, enable_count=False):
+        return 'MPI_T_event_instance'
+
+
+@Type.add_type('EVENT_INSTANCE', abi_type=['standard'])
+class TypeEventInstanceStandard(StandardABIType):
+
+    def return_code(self, name):
+        return [f'return {ConvertOMPIToStandard.COMM}({name});']
+
+    def type_text(self, enable_count=False):
+        return self.mangle_name('MPI_T_event_instance')
+
+    @property
+    def argument(self):
+        return f'{self.name}'

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -143,6 +143,34 @@
     'MPI_2INT',
     'MPI_SHORT_INT',
     'MPI_LONG_DOUBLE_INT',
+    'MPI_LOGICAL',
+    'MPI_INTEGER',
+    'MPI_REAL',
+    'MPI_COMPLEX',
+    'MPI_DOUBLE_PRECISION',
+    'MPI_CHARACTER',
+    'MPI_DOUBLE_COMPLEX',
+]
+
+PREDEFINED_OPTIONAL_FORTRAN_DATATYPES = [
+    'MPI_LOGICAL1',
+    'MPI_LOGICAL2',
+    'MPI_LOGICAL4',
+    'MPI_LOGICAL8',
+    'MPI_LOGICAL16',
+    'MPI_INTEGER1',
+    'MPI_INTEGER2',
+    'MPI_INTEGER4',
+    'MPI_INTEGER8',
+    'MPI_INTEGER16',
+    'MPI_REAL2',
+    'MPI_REAL4',
+    'MPI_REAL8',
+    'MPI_REAL16',
+    'MPI_COMPLEX4',
+    'MPI_COMPLEX8',
+    'MPI_COMPLEX16',
+    'MPI_COMPLEX32',
 ]
 
 # C type: MPI_Comm
@@ -195,9 +223,18 @@
 
 RESERVED_ERRHANDLERS = [
     'MPI_ERRHANDLER_NULL',
-    'MPI_ERRHANDLER_ARE_FATAL',
-    'MPI_ERRHANDLER_ABORT',
-    'MPI_ERRHANDLER_RETURN',
+    'MPI_ERRORS_ARE_FATAL',
+    'MPI_ERRORS_ABORT',
+    'MPI_ERRORS_RETURN',
+]
+
+RESERVED_COMM_COPY_ATTR_FNS = [
+    'MPI_COMM_NULL_COPY_FN',
+    'MPI_COMM_DUP_FN',
+]
+
+RESERVED_COMM_DEL_ATTR_FNS = [
+    'MPI_COMM_NULL_DELETE_FN'
 ]
 
 IGNORED_STATUS_HANDLES = [
@@ -222,6 +259,127 @@
     'MPI_NO_OP',
 ]
 
+COMM_GROUP_COMPARE_VALS = [
+    'MPI_IDENT',
+    'MPI_CONGRUENT',
+    'MPI_SIMILAR',
+    'MPI_UNEQUAL',
+]
+
+RESERVED_ATTR_KEYS = [
+    'MPI_KEYVAL_INVALID',
+    'MPI_TAG_UB',
+    'MPI_IO',
+    'MPI_HOST',
+    'MPI_WTIME_IS_GLOBAL',
+    'MPI_APPNUM',
+    'MPI_LASTUSEDCODE',
+    'MPI_UNIVERSE_SIZE',
+    'MPI_WIN_BASE',
+    'MPI_WIN_DISP_UNIT',
+    'MPI_WIN_SIZE',
+    'MPI_WIN_CREATE_FLAVOR',
+    'MPI_WIN_MODEL',
+]
+
+TS_LEVEL_VALUES = [
+    'MPI_THREAD_SINGLE',
+    'MPI_THREAD_FUNNELED',
+    'MPI_THREAD_SERIALIZED',
+    'MPI_THREAD_MULTIPLE',
+]
+
+
+T_SCOPE_VALUES = [
+    'MPI_T_SCOPE_CONSTANT',
+    'MPI_T_SCOPE_READONLY',
+    'MPI_T_SCOPE_LOCAL',
+    'MPI_T_SCOPE_GROUP',
+    'MPI_T_SCOPE_GROUP_EQ',
+    'MPI_T_SCOPE_ALL',
+    'MPI_T_SCOPE_ALL_EQ',
+]
+
+RESERVED_TAGS = [
+    'MPI_ANY_TAG',
+]
+
+RESERVED_SOURCE = [
+    'MPI_ANY_SOURCE',
+]
+
+RESERVED_ROOT = [
+    'MPI_ROOT',
+]
+
+RESERVED_PVAR_SESSIONS = [
+    'MPI_T_PVAR_SESSION_NULL',
+]
+
+RESERVED_CVAR_HANDLES = [
+    'MPI_T_CVAR_HANDLE_NULL',
+]
+    
+RESERVED_PVAR_HANDLES = [
+    'MPI_T_PVAR_HANDLE_NULL',
+]
+
+RESERVED_T_ENUMS = [
+    'MPI_T_ENUM_NULL',
+]
+
+T_BIND_VALUES = [
+    'MPI_T_BIND_NO_OBJECT',
+    'MPI_T_BIND_MPI_COMM',
+    'MPI_T_BIND_MPI_DATATYPE',
+    'MPI_T_BIND_MPI_ERRHANDLER',
+    'MPI_T_BIND_MPI_FILE',
+    'MPI_T_BIND_MPI_GROUP',
+    'MPI_T_BIND_MPI_OP',
+    'MPI_T_BIND_MPI_REQUEST',
+    'MPI_T_BIND_MPI_WIN',
+    'MPI_T_BIND_MPI_MESSAGE',
+    'MPI_T_BIND_MPI_INFO',
+    'MPI_T_BIND_MPI_SESSION',
+]
+
+T_VERBOSITY_VALUES = [
+    'MPI_T_VERBOSITY_USER_BASIC',
+    'MPI_T_VERBOSITY_USER_DETAIL',
+    'MPI_T_VERBOSITY_USER_ALL',
+    'MPI_T_VERBOSITY_TUNER_BASIC',
+    'MPI_T_VERBOSITY_TUNER_DETAIL',
+    'MPI_T_VERBOSITY_TUNER_ALL',
+    'MPI_T_VERBOSITY_MPIDEV_BASIC',
+    'MPI_T_VERBOSITY_MPIDEV_DETAIL',
+    'MPI_T_VERBOSITY_MPIDEV_ALL',
+]
+
+T_CB_SAFETY_VALUES = [
+    'MPI_T_CB_REQUIRE_NONE',
+    'MPI_T_CB_REQUIRE_MPI_RESTRICTED',
+    'MPI_T_CB_REQUIRE_THREAD_SAFE',
+    'MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE',
+]
+
+T_SOURCE_ORDER_VALUES = [
+    'MPI_T_SOURCE_ORDERED',
+    'MPI_T_SOURCE_UNORDERED',
+]
+
+T_PVAR_CLASS_VALUES = [
+    'MPI_T_PVAR_CLASS_STATE',
+    'MPI_T_PVAR_CLASS_LEVEL',
+    'MPI_T_PVAR_CLASS_SIZE',
+    'MPI_T_PVAR_CLASS_PERCENTAGE',
+    'MPI_T_PVAR_CLASS_HIGHWATERMARK',
+    'MPI_T_PVAR_CLASS_LOWWATERMARK',
+    'MPI_T_PVAR_CLASS_COUNTER',
+    'MPI_T_PVAR_CLASS_AGGREGATE',
+    'MPI_T_PVAR_CLASS_TIMER',
+    'MPI_T_PVAR_CLASS_GENERIC',
+]
+
 VARIOUS_CONSTANTS = {
     # Just setting this to the same as ompi ABI for right now, but will need to
     # match the standard ABI value when defined
@@ -289,9 +447,12 @@ class ConvertFuncs:
     CVAR_HANDLE = 'ompi_convert_abi_cvar_handle_intern_cvar_handle'
     T_ENUM = 'ompi_convert_abi_t_enum_intern_t_enum'
     T_BIND = 'ompi_convert_abi_t_bind_intern_t_bind'
-    CB_SAFETY = 'ompi_convert_abi_cb_safety_intern_cb_safety'
-    SOURCE_ORDER = 'ompi_convert_abi_source_order_intern_source_order'
+    T_CB_SAFETY = 'ompi_convert_abi_cb_safety_intern_cb_safety'
+    T_SOURCE_ORDER = 'ompi_convert_abi_source_order_intern_source_order'
     ATTR_KEY = 'ompi_convert_abi_attr_key_intern_attr_key'
+    COMM_COPY_ATTR_FUNCTION = 'ompi_convert_comm_copy_attr_fn_intern_comm_copy_attr_fn'
+    COMM_DELETE_ATTR_FUNCTION = 'ompi_convert_comm_delete_attr_fn_intern_comm_delete_attr_fn'
+    SPLIT_TYPE = 'ompi_convert_split_type_intern_type'
 
 
 class ConvertOMPIToStandard:
@@ -319,8 +480,9 @@ class ConvertOMPIToStandard:
     CVAR_HANDLE = 'ompi_convert_cvar_handle_ompi_to_standard'
     T_ENUM = 'ompi_convert_t_enum_ompi_to_standard'
     T_BIND = 'ompi_convert_t_bind_ompi_to_standard'
-    SOURCE_ORDER = 'ompi_convert_source_order_ompi_to_standard'
+    T_SOURCE_ORDER = 'ompi_convert_source_order_ompi_to_standard'
     ATTR_KEY = 'ompi_convert_attr_key_ompi_to_standard'
+    COMM_CMP = 'ompi_convert_comm_cmp_ompi_to_standard'
 
 
 # Inline function attributes