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, generalized macros for handling
translation of arrays of MPI_Fint's to c int's (and other types) 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.py

@@ -179,10 +179,11 @@ def print_c_source(self):
         c_func = self.c_func_name
         self.dump(f'void {c_func}({parameters});')
         self.dump(f'void {c_func}({parameters})')
-        count_type, disp_type = ('MPI_Count', 'MPI_Aint') if self.bigcount else ('int', 'int')
+        count_type, disp_type, count_fint_type = ('MPI_Count', 'MPI_Aint', 'MPI_Count') if self.bigcount else ('int', 'int', 'MPI_Fint')
         self.template.print_body(c_func, out=self.out,
                                  replacements={'INNER_CALL': self.inner_call,
                                                'COUNT_TYPE': count_type,
+                                               'COUNT_FINT_TYPE': count_fint_type,
                                                'DISP_TYPE': disp_type})
 
     def print_interface(self):

ompi/mpi/fortran/use-mpi-f08/allgather_init_ts.c.in

@@ -12,7 +12,7 @@
  * Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2015-2021 Research Organization for Information Science
  *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2024      Triad National Security, LLC. All rights
+ * Copyright (c) 2024-2025 Triad National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
  *
@@ -33,6 +33,7 @@ PROTOTYPE VOID allgather_init(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendtyp
     MPI_Info c_info;
     void *sendbuf = OMPI_CFI_BASE_ADDR(x1), *recvbuf = OMPI_CFI_BASE_ADDR(x2);
     @COUNT_TYPE@ c_sendcount = (@COUNT_TYPE@) *sendcount;
+    @COUNT_TYPE@ c_recvcount = (@COUNT_TYPE@) *recvcount;
 
     OMPI_CFI_CHECK_CONTIGUOUS(x2, c_ierr);
     if (MPI_SUCCESS != c_ierr) {
@@ -66,7 +67,7 @@ PROTOTYPE VOID allgather_init(BUFFER_ASYNC x1, COUNT sendcount, DATATYPE sendtyp
                           c_sendcount,
                           c_senddatatype,
                           recvbuf,
-                          (@COUNT_TYPE@) *recvcount,
+                          c_recvcount,
                           c_recvtype, c_comm, c_info, &c_req);
 
     if (c_senddatatype != c_sendtype) {