Support for MPI_MAX_PORT_NAME in fortran

Move MPI_Comm_accept and MPI_Comm_connect for fortran in func_char_fort.c
cea-hpc · Jan 19, 2024 · ccddc41 · ccddc41
1 parent 4feef3b
commit ccddc41
Show file tree

Hide file tree

Showing 11 changed files with 320 additions and 357 deletions.
diff --git a/generator/FORTRAN/func_list.txt b/generator/FORTRAN/func_list.txt
@@ -284,8 +284,8 @@ MPI_Rput
 ##########
 #- Comm -#
 ##########
-MPI_Comm_accept
-MPI_Comm_connect
+#MPI_Comm_accept
+#MPI_Comm_connect
 MPI_Comm_create_group
 MPI_Comm_disconnect
 MPI_Comm_get_info

diff --git a/generator/FORTRAN/func_list_interface.txt b/generator/FORTRAN/func_list_interface.txt
@@ -284,8 +284,8 @@ MPI_Rput
 ##########
 #- Comm -#
 ##########
-MPI_Comm_accept
-MPI_Comm_connect
+#MPI_Comm_accept
+#MPI_Comm_connect
 MPI_Comm_create_group
 MPI_Comm_disconnect
 MPI_Comm_get_info

diff --git a/generator/FORTRAN/func_list_interface_interface.text b/generator/FORTRAN/func_list_interface_interface.text
@@ -284,8 +284,8 @@ MPI_Rput
 ##########
 #- Comm -#
 ##########
-MPI_Comm_accept
-MPI_Comm_connect
+#MPI_Comm_accept
+#MPI_Comm_connect
 MPI_Comm_create_group
 MPI_Comm_disconnect
 MPI_Comm_get_info

diff --git a/generator/FORTRAN/func_list_preload.txt b/generator/FORTRAN/func_list_preload.txt
@@ -284,8 +284,8 @@ MPI_Rput
 ##########
 #- Comm -#
 ##########
-MPI_Comm_accept
-MPI_Comm_connect
+#MPI_Comm_accept
+#MPI_Comm_connect
 MPI_Comm_create_group
 MPI_Comm_disconnect
 MPI_Comm_get_info

diff --git a/generator/generate.py b/generator/generate.py
@@ -272,6 +272,8 @@ def generate_wrapper_f(object_gen, data_f, data_f_overide, wrapper, root, list_n
         string=string+object_gen.load_symbol({'name':'MPI_Publish_name'},'RTLD_NEXT')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Unpublish_name'},'RTLD_NEXT')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Lookup_name'},'RTLD_NEXT')+'\n'
+        string=string+object_gen.load_symbol({'name':'MPI_Comm_accept'},'RTLD_NEXT')+'\n'
+        string=string+object_gen.load_symbol({'name':'MPI_Comm_connect'},'RTLD_NEXT')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Pack_external'},'RTLD_NEXT')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Pack_external_size'},'RTLD_NEXT')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Unpack_external'},'RTLD_NEXT')+'\n'
@@ -301,6 +303,8 @@ def generate_wrapper_f(object_gen, data_f, data_f_overide, wrapper, root, list_n
         string=string+object_gen.load_symbol({'name':'MPI_Publish_name'},'lib_handle_f')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Unpublish_name'},'lib_handle_f')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Lookup_name'},'lib_handle_f')+'\n'
+        string=string+object_gen.load_symbol({'name':'MPI_Comm_accept'},'lib_handle_f')+'\n'
+        string=string+object_gen.load_symbol({'name':'MPI_Comm_connect'},'lib_handle_f')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Pack_external'},'lib_handle_f')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Pack_external_size'},'lib_handle_f')+'\n'
         string=string+object_gen.load_symbol({'name':'MPI_Unpack_external'},'lib_handle_f')+'\n'
@@ -519,6 +523,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Publish_name)(char *, int *, char *, int *, int, int);\n'  
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Unpublish_name)(char *, int *, char *, int *, int, int);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Lookup_name)(char *, int *, char *, int *, int, int);\n'   
+    string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Comm_accept)(char *, int *, int *, int *, int *, int *, int);\n'   
+    string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Comm_connect)(char *, int *, int *, int *, int *, int *, int);\n'   
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Pack_external)(char *, void *, int, int *, void *, size_t, size_t *, int *, int);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Pack_external_size)(char *, int, int *, size_t *, int *, int);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Unpack_external)(char *, void *, size_t, size_t *, void *, int, int *, int *, int);\n'
@@ -547,6 +553,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Publish_name)(char *, int *, char *, int *, int, int);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Unpublish_name)(char *, int *, char *, int *, int, int);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Lookup_name)(char *, int *, char *, int *, int, int);\n'
+    string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Comm_accept)(char *, int *, int *, int *, int *, int *, int);\n'   
+    string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Comm_connect)(char *, int *, int *, int *, int *, int *, int);\n'   
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Pack_external)(char *, void *, int, int *, void *, size_t, size_t *, int *, int);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Pack_external_size)(char *, int, int *, size_t *, int *, int);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Unpack_external)(char *, void *, size_t, size_t *, void *, int, int *, int *, int);\n'
@@ -577,6 +585,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Publish_name)(char *, int *, char *, int *, size_t, size_t);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Unpublish_name)(char *, int *, char *, int *, size_t, size_t);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Lookup_name)(char *, int *, char *, int *, size_t, size_t);\n'
+    string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Comm_accept)(char *, int *, int *, int *, int *, int *, size_t);\n'   
+    string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Comm_connect)(char *, int *, int *, int *, int *, int *, size_t);\n'   
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Pack_external)(char *, void *, int, int *, void *, size_t, size_t *, int *, size_t);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Pack_external_size)(char *, int, int *, size_t *, int *, size_t);\n'
     string=string+'extern void (INTERF_2_OMPI_A_f_MPI_Unpack_external)(char *, void *, size_t, size_t *, void *, int, int *, int *, size_t);\n'
@@ -605,6 +615,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Publish_name)(char *, int *, char *, int *, size_t, size_t);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Unpublish_name)(char *, int *, char *, int *, size_t, size_t);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Lookup_name)(char *, int *, char *, int *, size_t, size_t);\n'
+    string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Comm_accept)(char *, int *, int *, int *, int *, int *, size_t);\n'   
+    string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Comm_connect)(char *, int *, int *, int *, int *, int *, size_t);\n'   
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Pack_external)(char *, void *, int, int *, void *, size_t, size_t *, int *, size_t);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Pack_external_size)(char *, int, int *, size_t *, int *, size_t);\n'
     string=string+'extern void (INTERF_2_INTEL_A_f_MPI_Unpack_external)(char *, void *, size_t, size_t *, void *, int, int *, int *, size_t);\n'
@@ -682,6 +694,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
     string=string+'INTERFACE_F_LOCAL_MPI_Publish_name=dlsym(interface_handle_f, \"A_f_MPI_Publish_name\");\n'
     string=string+'INTERFACE_F_LOCAL_MPI_Unpublish_name=dlsym(interface_handle_f, \"A_f_MPI_Unpublish_name\");\n'
     string=string+'INTERFACE_F_LOCAL_MPI_Lookup_name=dlsym(interface_handle_f, \"A_f_MPI_Lookup_name\");\n'
+    string=string+'INTERFACE_F_LOCAL_MPI_Comm_accept=dlsym(interface_handle_f, \"A_f_MPI_Comm_accept\");\n'
+    string=string+'INTERFACE_F_LOCAL_MPI_Comm_connect=dlsym(interface_handle_f, \"A_f_MPI_Comm_connect\");\n'
     string=string+'INTERFACE_F_LOCAL_MPI_Pack_external=dlsym(interface_handle_f, \"A_f_MPI_Pack_external\");\n'
     string=string+'INTERFACE_F_LOCAL_MPI_Pack_external_size=dlsym(interface_handle_f, \"A_f_MPI_Pack_external_size\");\n'
     string=string+'INTERFACE_F_LOCAL_MPI_Unpack_external=dlsym(interface_handle_f, \"A_f_MPI_Unpack_external\");\n'
@@ -718,6 +732,8 @@ def generate_interface_f(object_gen, data2,data_f,def_list_f,static_list=["OMPI"
         string=string+'handle_loader(MPI_Publish_name,INTERF_2_'+k+'_A_f_);\n'
         string=string+'handle_loader(MPI_Unpublish_name,INTERF_2_'+k+'_A_f_);\n'
         string=string+'handle_loader(MPI_Lookup_name,INTERF_2_'+k+'_A_f_);\n'
+        string=string+'handle_loader(MPI_Comm_accept,INTERF_2_'+k+'_A_f_);\n'
+        string=string+'handle_loader(MPI_Comm_connect,INTERF_2_'+k+'_A_f_);\n'
         string=string+'handle_loader(MPI_Pack_external,INTERF_2_'+k+'_A_f_);\n'
         string=string+'handle_loader(MPI_Pack_external_size,INTERF_2_'+k+'_A_f_);\n'
         string=string+'handle_loader(MPI_Unpack_external,INTERF_2_'+k+'_A_f_);\n'