Fix distribution build with scripts and TS 29113

Support for TS 29113 in the Fortran bindings should now work with
distribution builds. Generated Fortran files are now using macros to
determine the TKR syntax used by the specific compiler, and two backing
C files are generated, one with and one without TS support.

Signed-off-by: Jake Tronge <jtronge@lanl.gov>

Author: jtronge

ompi/Makefile.am

@@ -157,16 +157,6 @@ include_HEADERS =
 dist_ompidata_DATA =
 lib@OMPI_LIBMPI_NAME@_la_SOURCES += $(headers)
 
-# Python binding files
-EXTRA_DIST = \
-        mpi/bindings/bindings.py \
-        mpi/bindings/ompi_bindings/consts.py \
-        mpi/bindings/ompi_bindings/c.py \
-        mpi/bindings/ompi_bindings/c_type.py \
-        mpi/bindings/ompi_bindings/fortran.py \
-        mpi/bindings/ompi_bindings/fortran_type.py \
-        mpi/bindings/ompi_bindings/util.py
-
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS

ompi/mpi/Makefile.am

@@ -20,6 +20,13 @@
 #
 
 EXTRA_DIST = \
-        mpi/fortran/configure-fortran-output-bottom.h
+        mpi/fortran/configure-fortran-output-bottom.h \
+        mpi/bindings/bindings.py \
+        mpi/bindings/ompi_bindings/consts.py \
+        mpi/bindings/ompi_bindings/c.py \
+        mpi/bindings/ompi_bindings/c_type.py \
+        mpi/bindings/ompi_bindings/fortran.py \
+        mpi/bindings/ompi_bindings/fortran_type.py \
+        mpi/bindings/ompi_bindings/util.py
 
 dist_ompidata_DATA += mpi/help-mpi-api.txt

ompi/mpi/bindings/bindings.py

@@ -31,6 +31,7 @@ def main():
 
     # Fortran set up code
     parser_fortran = subparsers.add_parser('fortran', help='subcommand for generating Fortran code')
+    parser_fortran.add_argument('--ts', action='store_true', help='generate bindings w/o TS 29113 support')
     parser_fortran.add_argument('--template', required=True, help='template file to use')
     subparsers_fortran = parser_fortran.add_subparsers()
     # Handler for generating actual code

ompi/mpi/bindings/ompi_bindings/fortran.py

@@ -118,16 +118,19 @@ def load_prototypes(fname):
 class FortranBinding:
     """Class for generating the binding for a single function."""
 
-    def __init__(self, prototype, out, bigcount=False):
+    def __init__(self, prototype, out, bigcount=False, ts=False):
+        # Generate bigcount interface version
         self.bigcount = bigcount
+        # Generate files with support for TS 29113 or not
+        self.ts = ts
         self.fn_name = prototype.fn_name
         self.out = out
         self.parameters = []
         param_map = {}
         dep_params = {}
         for param in prototype.parameters:
             type_ = FortranType.get(param.type_name)
-            param_type = type_(param.name, self.fn_name, bigcount=bigcount)
+            param_type = type_(param.name, self.fn_name, bigcount=bigcount, ts=ts)
             self.parameters.append(param_type)
             param_map[param.name] = param_type
             if param.dep_params is not None:
@@ -340,10 +343,10 @@ def print_profiling_rename_macros(prototypes, out):
     out.dump('#endif /* OMPI_BUILD_MPI_PROFILING */')
 
 
-def print_c_source_header(out):
+def print_c_source_header(out, ts=False):
     """Print the header of the C source file."""
     out.dump(f'/* {consts.GENERATED_MESSAGE} */')
-    if compiler.HAVE_TS:
+    if ts:
         out.dump('#include <ISO_Fortran_binding.h>')
         out.dump('#include "ts.h"')
     out.dump('#include "ompi_config.h"')
@@ -356,9 +359,9 @@ def print_c_source_header(out):
     out.dump('#include "ompi/communicator/communicator.h"')
 
 
-def print_binding(prototype, lang, out, bigcount=False):
+def print_binding(prototype, lang, out, bigcount=False, ts=False):
     """Print the binding with or without bigcount."""
-    binding = FortranBinding(prototype, out=out, bigcount=bigcount)
+    binding = FortranBinding(prototype, out=out, bigcount=bigcount, ts=ts)
     if lang == 'fortran':
         binding.print_f_source()
     else:
@@ -374,13 +377,13 @@ def generate_code(args, out):
         print_profiling_rename_macros(prototypes, out)
         out.dump()
     else:
-        print_c_source_header(out)
+        print_c_source_header(out, ts=args.ts)
     for prototype in prototypes:
         out.dump()
-        print_binding(prototype, args.lang, out)
+        print_binding(prototype, args.lang, out, ts=args.ts)
         if util.fortran_prototype_has_bigcount(prototype):
             out.dump()
-            print_binding(prototype, args.lang, bigcount=True, out=out)
+            print_binding(prototype, args.lang, bigcount=True, out=out, ts=args.ts)
 
 
 def generate_interface(args, out):
@@ -390,10 +393,10 @@ def generate_interface(args, out):
     for prototype in prototypes:
         ext_name = util.ext_api_func_name(prototype.fn_name)
         out.dump(f'interface {ext_name}')
-        binding = FortranBinding(prototype, out=out)
+        binding = FortranBinding(prototype, out=out, ts=args.ts)
         binding.print_interface()
         if util.fortran_prototype_has_bigcount(prototype):
             out.dump()
-            binding_c = FortranBinding(prototype, out=out, bigcount=True)
+            binding_c = FortranBinding(prototype, out=out, bigcount=True, ts=args.ts)
             binding_c.print_interface()
         out.dump(f'end interface {ext_name}')