F08: refactor templates

This PR refactors some of the f08 template files introduced in PR open-mpi#12621.
Many of them had been using, incorrectly, macros from fint_2_int.h.
The code in the use-mpi-f08 folder now makes use of generated code
in the wrapper around the internal c code to avoid many of the problems
that these older macros were trying to solve by providing 'c' interfaces
directly to the fortran compiler.  Also, simpified macros for handling
translation of arrays of MPI_Fint's to c int's are used in these
templates.

Related to open-mpi#13168 and associated issue raised by a user on the mail list.

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

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/fortran_type.py

@@ -507,32 +507,42 @@ def declare(self):
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(OUT) :: {self.name}'
 
-
 @FortranType.add('COMM_INOUT')
 class CommInOutType(CommType):
     def declare(self):
         if self.gen_f90 == False:
             return f'TYPE(MPI_Comm), INTENT(INOUT) :: {self.name}'
         else:
             return f'INTEGER, INTENT(INOUT) :: {self.name}'
-    
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(INOUT) :: {self.name}'
 
+    def argument(self):
+        return f'{self.name}%MPI_VAL'
+    
+    def use(self):
+        return [('mpi_f08_types', 'MPI_Comm')]
+
+    def c_parameter(self):
+        return f'MPI_Fint *{self.name}'
+
 @FortranType.add('GROUP')
 class GroupType(FortranType):
     def declare(self):
         if self.gen_f90 == False:
             return f'TYPE(MPI_Group), INTENT(IN) :: {self.name}'
         else:
             return f'INTEGER, INTENT(IN) :: {self.name}'
-    
+
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(IN) :: {self.name}'
 
     def argument(self):
         return f'{self.name}%MPI_VAL'
 
+    def c_parameter(self):
+        return f'MPI_Fint *{self.name}'
+    
     def use(self):
         if self.gen_f90 == False:
             return [('mpi_f08_types', 'MPI_Group')]
@@ -647,7 +657,6 @@ def c_parameter(self):
 
 @FortranType.add('STATUS_INOUT')
 class StatusInOutType(StatusType):
-    def declare(self):
         if self.gen_f90 == False:
             return f'TYPE(MPI_Status), INTENT(INOUT) :: {self.name}'
         else:
@@ -657,8 +666,27 @@ def c_parameter(self):
         # TODO: Is this correct? (I've listed it as TYPE(MPI_Status) in the binding)
         return f'MPI_Fint *{self.name}'
 
+
 @FortranType.add('REQUEST')
 class RequestType(FortranType):
+    def declare(self):
+        return f'TYPE(MPI_Request), INTENT(IN) :: {self.name}'
+
+    def declare_cbinding_fortran(self):
+        return f'INTEGER, INTENT(IN) :: {self.name}'
+
+    def argument(self):
+        return f'{self.name}%MPI_VAL'
+
+    def use(self):
+        return [('mpi_f08_types', 'MPI_Request')]
+
+    def c_parameter(self):
+        return f'MPI_Fint *{self.name}'
+
+@FortranType.add('REQUEST_OUT')
+class RequestTypeOut(FortranType):
+>>>>>>> a8ae2dab60 (F08: refactor templates)
     def declare(self):
         if self.gen_f90 == False:
             return f'TYPE(MPI_Request), INTENT(IN) :: {self.name}'
@@ -702,6 +730,14 @@ def declare(self):
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(INOUT) :: {self.name}'
 
+@FortranType.add('REQUEST_INOUT')
+class RequestTypeInOut(RequestType):
+    def declare(self):
+        return f'TYPE(MPI_Request), INTENT(INOUT) :: {self.name}'
+        
+    def declare_cbinding_fortran(self):
+        return f'INTEGER, INTENT(INOUT) :: {self.name}'
+
 
 @FortranType.add('REQUEST_ARRAY')
 class RequestArrayType(FortranType):
@@ -1034,6 +1070,9 @@ def declare(self):
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(IN) :: {self.name}'
 
+    def declare_cbinding_fortran(self):
+        return f'INTEGER, INTENT(IN) :: {self.name}'
+
     def use(self):
         if self.gen_f90 == False:
             return [('mpi_f08_types', 'MPI_Op')]
@@ -1046,6 +1085,9 @@ def argument(self):
         else:
             return f'{self.name}'
 
+    def argument(self):
+        return f'{self.name}%MPI_VAL'
+
     def c_parameter(self):
         return f'MPI_Fint *{self.name}'
 
@@ -1072,6 +1114,9 @@ def declare(self):
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(IN) :: {self.name}'
 
+    def declare_cbinding_fortran(self):
+        return f'INTEGER, INTENT(IN) :: {self.name}'
+
     def use(self):
         if self.gen_f90 == False:
             return [('mpi_f08_types', 'MPI_Win')]
@@ -1084,6 +1129,9 @@ def argument(self):
         else:
             return f'{self.name}'
 
+    def argument(self):
+        return f'{self.name}%MPI_VAL'
+
     def c_parameter(self):
         return f'MPI_Fint *{self.name}'
 
@@ -1100,6 +1148,16 @@ def declare(self):
     def declare_cbinding_fortran(self):
         return f'INTEGER, INTENT(OUT) :: {self.name}'
 
+@FortranType.add('WIN_INOUT')
+class WinInOut(Win):
+    """MPI_Win inout type."""
+
+    def declare(self):
+        if self.gen_f90 == False:
+            return f'TYPE(MPI_Win), INTENT(INOUT) :: {self.name}'
+        else:
+            return f'INTEGER, INTENT(INOUT) :: {self.name}'
+
 @FortranType.add('WIN_INOUT')
 class WinInOut(Win):
     """MPI_Win inout type."""
@@ -1418,7 +1476,7 @@ def use(self):
             return [('mpi_f08_interfaces_callbacks', 'MPI_Type_copy_attr_function'), ('iso_c_binding', 'c_funloc'), ('iso_c_binding', 'c_funptr')]
         else:
             return []
-
+        
 @FortranType.add('WIN_COPY_ATTR_FN')
 class WinCopyAttrFnType(CommCopyAttrFnType):
     def declare(self):