Add bigcount APIs for recv and send

Author: jtronge

ompi/mpi/fortran/use-mpi-f08/Makefile.am

@@ -112,7 +112,9 @@ CLEANFILES += sizeof_f08.h sizeof_f08.f90 psizeof_f08.f90
 
 mpi_api_generated_files = \
         send_f08_generated.F90 \
-        recv_f08_generated.F90
+        send_f08_c_generated.F90 \
+        recv_f08_generated.F90 \
+        recv_f08_c_generated.F90
 mpi_api_files = \
         abort_f08.F90 \
         accumulate_f08.F90 \
@@ -591,6 +593,8 @@ MAINTAINERCLEANFILES =
 if OMPI_GENERATE_BINDINGS
 %_generated.F90: %.in generate_bindings.py
 	$(PYTHON) $(srcdir)/generate_bindings.py fortran $< > $@
+%_c_generated.F90: %.in generate_bindings.py
+	$(PYTHON) $(srcdir)/generate_bindings.py fortran $< --bigcount > $@
 
 MAINTAINERCLEANFILES += $(mpi_api_generated_files)
 endif

ompi/mpi/fortran/use-mpi-f08/base/Makefile.am

@@ -33,11 +33,15 @@ noinst_LTLIBRARIES = libusempif08_ccode.la
 libusempif08_ccode_la_SOURCES = \
         buffer_detach.c \
         send_f08_generated.c \
-        recv_f08_generated.c
+        send_f08_c_generated.c \
+        recv_f08_generated.c \
+        recv_f08_c_generated.c
 
 if OMPI_GENERATE_BINDINGS
 %_generated.c: ../%.in $(srcdir)/../generate_bindings.py
 	$(PYTHON) $(srcdir)/../generate_bindings.py c $< > $@
+%_c_generated.c: ../%.in $(srcdir)/../generate_bindings.py
+	$(PYTHON) $(srcdir)/../generate_bindings.py c $< --bigcount > $@
 
 MAINTAINERCLEANFILES = send_f08_generated.c
 endif

ompi/mpi/fortran/use-mpi-f08/generate_bindings.py

@@ -16,9 +16,9 @@
 
 class FortranType(ABC):
 
-    def __init__(self, name, **kwargs):
+    def __init__(self, name, bigcount=False, **kwargs):
         self.name = name
-        self.bigcount = False
+        self.bigcount = bigcount
 
     TYPES = {}
 
@@ -93,6 +93,9 @@ def declare(self):
         else:
             return f'INTEGER, INTENT(IN) :: {self.name}'
 
+    def use(self):
+        return [('mpi_f08_types', 'MPI_COUNT_KIND')]
+
     def c_parameter(self):
         type_ = 'MPI_Count' if self.bigcount else 'MPI_Fint'
         return f'{type_} *{self.name}'
@@ -209,20 +212,6 @@ class PrototypeParseError(Exception):
     """Thrown when a parsing error is encountered."""
 
 
-def fortran_f08_name(base_name):
-    """Produce the final f08 name from base_name."""
-    return f'MPI_{base_name.capitalize()}_f08'
-
-
-def c_func_name(base_name):
-    """Produce the final C func name from base_name."""
-    return f'ompi_{base_name}_wrapper_f08'
-
-
-def c_api_func_name(base_name):
-    """Produce the actual MPI API function name to call into."""
-    return f'PMPI_{base_name.capitalize()}'
-
 
 def print_header():
     """Print the fortran f08 file header."""
@@ -232,7 +221,8 @@ def print_header():
 
 class FortranBinding:
 
-    def __init__(self, fname):
+    def __init__(self, fname, bigcount=False):
+        self.bigcount = bigcount
         with open(fname) as fp:
             data = []
             for line in fp:
@@ -251,7 +241,26 @@ def __init__(self, fname):
                 type_, name = param.split()
                 type_ = FortranType.get(type_)
                 indent = '    '
-                self.parameters.append(type_(name))
+                self.parameters.append(type_(name, bigcount=bigcount))
+
+    def _fn_name_suffix(self):
+        """Return a suffix for function names."""
+        return '_c' if self.bigcount else ''
+
+    @property
+    def fortran_f08_name(self):
+        """Produce the final f08 name from base_name."""
+        return f'MPI_{self.fn_name.capitalize()}_f08{self._fn_name_suffix()}'
+
+    @property
+    def c_func_name(self):
+        """Produce the final C func name from base_name."""
+        return f'ompi_{self.fn_name}_wrapper_f08{self._fn_name_suffix()}'
+
+    @property
+    def c_api_func_name(self):
+        """Produce the actual MPI API function name to call into."""
+        return f'PMPI_{self.fn_name.capitalize()}{self._fn_name_suffix()}'
 
     def _param_list(self):
         return ','.join(type_.name for type_ in self.parameters)
@@ -277,7 +286,7 @@ def _use_stmts(self):
 
     def _print_fortran_interface(self):
         """Output the C subroutine binding for the Fortran code."""
-        name = c_func_name(self.fn_name)
+        name = self.c_func_name
         print('    interface')
         print(f'        subroutine {name}({self._param_list()},ierror) &')
         print(f'            BIND(C, name="{name}")')
@@ -297,8 +306,8 @@ def print_f_source(self):
 
         print_header()
 
-        sub_name = fortran_f08_name(self.fn_name)
-        c_func = c_func_name(self.fn_name)
+        sub_name = self.fortran_f08_name
+        c_func = self.c_func_name
         print('subroutine', f'{sub_name}({self._param_list()},ierror)')
         # Use statements
         use_stmts = self._use_stmts()
@@ -335,7 +344,7 @@ def print_c_source(self):
         print('#include "ompi/mpi/fortran/mpif-h/status-conversion.h"')
         print('#include "ompi/mpi/fortran/base/constants.h"')
         print('#include "ompi/mpi/fortran/base/fint_2_int.h"')
-        c_func = c_func_name(self.fn_name)
+        c_func = self.c_func_name
         parameters = [param.c_parameter() for param in self.parameters]
         # Always append the integer error
         parameters.append('MPI_Fint *ierr')
@@ -348,25 +357,25 @@ def print_c_source(self):
         for param in self.parameters:
             for line in param.c_prepare():
                 print(f'    {line}')
-        c_api_func = c_api_func_name(self.fn_name)
+        c_api_func = self.c_api_func_name
         arguments = [param.c_argument() for param in self.parameters]
         arguments = ', '.join(arguments)
         print(f'    {C_ERROR_TEMP_NAME} = {c_api_func}({arguments});')
+        print(f'    *ierr = OMPI_INT_2_FINT({C_ERROR_TEMP_NAME});')
         for param in self.parameters:
             for line in param.c_post():
                 print(f'    {line}')
-        # TODO: Is this NULL check necessary for mpi_f08?
-        print(f'    if (NULL != ierr) *ierr = OMPI_INT_2_FINT({C_ERROR_TEMP_NAME});')
         print('}')
 
 
 def main():
     parser = argparse.ArgumentParser(description='generate fortran binding files')
     parser.add_argument('lang', choices=('fortran', 'c'), help='generate dependent files in C or Fortran')
     parser.add_argument('template', help='template file to use')
+    parser.add_argument('--bigcount', action='store_true', help='generate bigcount interface for function')
     args = parser.parse_args()
 
-    binding = FortranBinding(args.template)
+    binding = FortranBinding(args.template, bigcount=args.bigcount)
     if args.lang == 'fortran':
         binding.print_f_source()
     else:

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.h.in

@@ -300,6 +300,18 @@ subroutine MPI_Recv_f08(buf,count,datatype,source,tag,comm,status,ierror)
    TYPE(MPI_Status) :: status
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
 end subroutine MPI_Recv_f08
+subroutine MPI_Recv_f08_c(buf,count,datatype,source,tag,comm,status,ierror)
+   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_Status, MPI_COUNT_KIND
+   implicit none
+   @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ buf
+   @OMPI_FORTRAN_IGNORE_TKR_TYPE@ :: buf
+   INTEGER(KIND=MPI_COUNT_KIND), INTENT(IN) :: count
+   INTEGER, INTENT(IN) :: source, tag
+   TYPE(MPI_Datatype), INTENT(IN) :: datatype
+   TYPE(MPI_Comm), INTENT(IN) :: comm
+   TYPE(MPI_Status) :: status
+   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
+end subroutine MPI_Recv_f08_c
 end interface  MPI_Recv
 
 interface  MPI_Recv_init
@@ -374,6 +386,17 @@ subroutine MPI_Send_f08(buf,count,datatype,dest,tag,comm,ierror)
    TYPE(MPI_Comm), INTENT(IN) :: comm
    INTEGER, OPTIONAL, INTENT(OUT) :: ierror
 end subroutine MPI_Send_f08
+subroutine MPI_Send_f08_c(buf,count,datatype,dest,tag,comm,ierror)
+   use :: mpi_f08_types, only : MPI_Datatype, MPI_Comm, MPI_COUNT_KIND
+   implicit none
+   @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ buf
+   @OMPI_FORTRAN_IGNORE_TKR_TYPE@, INTENT(IN) :: buf
+   INTEGER(KIND=MPI_COUNT_KIND), INTENT(IN) :: count
+   INTEGER, INTENT(IN) :: dest, tag
+   TYPE(MPI_Datatype), INTENT(IN) :: datatype
+   TYPE(MPI_Comm), INTENT(IN) :: comm
+   INTEGER, OPTIONAL, INTENT(OUT) :: ierror
+end subroutine MPI_Send_f08_c
 end interface  MPI_Send
 
 interface  MPI_Sendrecv

ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-rename.h

@@ -49,6 +49,7 @@
 #define MPI_Probe_f08 PMPI_Probe_f08
 #define MPI_Recv PMPI_Recv
 #define MPI_Recv_f08 PMPI_Recv_f08
+#define MPI_Recv_f08_c PMPI_Recv_f08_c
 #define MPI_Recv_init PMPI_Recv_init
 #define MPI_Recv_init_f08 PMPI_Recv_init_f08
 #define MPI_Request_free PMPI_Request_free
@@ -61,6 +62,7 @@
 #define MPI_Rsend_init_f08 PMPI_Rsend_init_f08
 #define MPI_Send PMPI_Send
 #define MPI_Send_f08 PMPI_Send_f08
+#define MPI_Send_f08_c PMPI_Send_f08_c
 #define MPI_Sendrecv PMPI_Sendrecv
 #define MPI_Sendrecv_f08 PMPI_Sendrecv_f08
 #define MPI_Sendrecv_replace PMPI_Sendrecv_replace