-
Notifications
You must be signed in to change notification settings - Fork 859
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor bigcount/ABI generation code and add Fortran TS 29113 support
This refactors the Python scripts for generating the C and Fortran interfaces into ompi/mpi/bindings/ and extends the Fortran code for more complicated functions. TS 29113 support is also added here, with code imported from PR #10302. Signed-off-by: Jake Tronge <[email protected]>
- Loading branch information
Showing
28 changed files
with
3,261 additions
and
2,349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| dnl -*- shell-script -*- | ||
| dnl | ||
| dnl Copyright (c) 2019 Research Organization for Information Science | ||
| dnl and Technology (RIST). All rights reserved. | ||
| dnl $COPYRIGHT$ | ||
| dnl | ||
| dnl Additional copyrights may follow | ||
| dnl | ||
| dnl $HEADER$ | ||
| dnl | ||
|
|
||
| # Check whether or not the C compiler supports ISO_Fortran_binding.h | ||
| # Also check whether C and Fortran compiler interoperate. | ||
| # | ||
| # OMPI_FORTRAN_CHECK_TS([action if found], [action if not found]) | ||
| # ---------------------------------------------------- | ||
| AC_DEFUN([OMPI_FORTRAN_CHECK_TS],[ | ||
| AS_VAR_PUSHDEF([fortran_ts], [ompi_cv_fortran_have_ts]) | ||
|
|
||
| AC_CHECK_HEADERS([ISO_Fortran_binding.h], | ||
| [AC_CACHE_CHECK([if Fortran and C compilers support ISO_Fortran_binding.h], fortran_ts, | ||
| [mkdir conftest.$$ | ||
| cd conftest.$$ | ||
|
|
||
| # Try to compile the C bindings | ||
| cat > conftest_c.c << EOF | ||
| #include <ISO_Fortran_binding.h> | ||
|
|
||
| int is_contiguous_c(CFI_cdesc_t* x) { | ||
| return CFI_is_contiguous(x); | ||
| } | ||
| EOF | ||
| OPAL_LOG_COMMAND([$CC $CCFLAGS -c conftest_c.c], | ||
| [cat > conftest.f90 << EOF | ||
| module MOD_IS_CONTIGUOUS | ||
|
|
||
| interface | ||
|
|
||
| function is_contiguous(buf) BIND(C, name="is_contiguous_c") | ||
| implicit none | ||
| type(*), dimension(..) :: buf | ||
| integer :: is_contiguous | ||
| end function is_contiguous | ||
|
|
||
| end interface | ||
|
|
||
| end module | ||
|
|
||
| program test_is_contiguous | ||
| use MOD_IS_CONTIGUOUS | ||
| implicit none | ||
| integer :: a0, a1(2), a2(2,2), a3(2,2,2) | ||
| write (*,*) is_contiguous(a0) | ||
| write (*,*) is_contiguous(a1) | ||
| write (*,*) is_contiguous(a2) | ||
| write (*,*) is_contiguous(a3) | ||
| end program | ||
| EOF | ||
| OPAL_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftest.f90 conftest_c.o $LDFLAGS $LIBS], | ||
| [AS_VAR_SET(fortran_ts, yes)], | ||
| [AS_VAR_SET(fortran_ts, no)])], | ||
| [AS_VAR_SET(fortran_ts, no)]) | ||
| cd .. | ||
| rm -rf conftest.$$])], | ||
| [AS_VAR_SET(fortran_ts, no)]) | ||
|
|
||
| AS_VAR_IF(fortran_ts, [yes], [$1], [$2]) | ||
| AS_VAR_POPDEF([fortran_ts])dnl | ||
| ]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # Copyright (c) 2024 Triad National Security, LLC. All rights | ||
| # reserved. | ||
| # | ||
| # $COPYRIGHT$ | ||
| # | ||
| # Additional copyrights may follow | ||
| # | ||
| # $HEADER$ | ||
| import argparse | ||
| import os | ||
| import sys | ||
|
|
||
|
|
||
| def handle_missing_command(args, out): | ||
| print('missing subcommand (one of {fortran,c} required)', file=sys.stderr) | ||
| sys.exit(1) | ||
|
|
||
|
|
||
| def main(): | ||
| parser = argparse.ArgumentParser(description='generate fortran binding files') | ||
| parser.add_argument('--builddir', required=True, help='absolute path to automake builddir (abs_top_builddir)') | ||
| parser.add_argument('--output', required=True, help='output file to use') | ||
| parser.add_argument('--srcdir', required=True, help='absolute path to automake srcdir (abs_top_srcdir)') | ||
| parser.set_defaults(handler=handle_missing_command) | ||
| subparsers = parser.add_subparsers() | ||
|
|
||
| # Fortran set up code | ||
| parser_fortran = subparsers.add_parser('fortran', help='subcommand for generating Fortran code') | ||
| parser_fortran.add_argument('--template', required=True, help='template file to use') | ||
| subparsers_fortran = parser_fortran.add_subparsers() | ||
| # Handler for generating actual code | ||
| parser_code = subparsers_fortran.add_parser('code', help='generate binding code') | ||
| parser_code.add_argument('lang', choices=('fortran', 'c'), | ||
| help='generate dependent files in C or Fortran') | ||
| parser_code.set_defaults(handler=lambda args, out: fortran.generate_code(args, out)) | ||
| # Handler for generating the Fortran interface files | ||
| parser_interface = subparsers_fortran.add_parser('interface', | ||
| help='generate Fortran interface specifcations') | ||
| parser_interface.set_defaults(handler=lambda args, out: fortran.generate_interface(args, out)) | ||
|
|
||
| # C set up code | ||
| parser_c = subparsers.add_parser('c', help='subcommand for generating C code') | ||
| subparsers_c = parser_c.add_subparsers() | ||
| parser_header = subparsers_c.add_parser('header') | ||
| parser_header.add_argument('file', nargs='+', help='list of template source files') | ||
| parser_header.add_argument('--external', action='store_true', help='generate external mpi.h header file') | ||
| parser_header.add_argument('--srcdir', help='source directory') | ||
| parser_header.set_defaults(handler=lambda args, out: c.generate_header(args, out)) | ||
| parser_gen = subparsers_c.add_parser('source') | ||
| # parser = argparse.ArgumentParser(description='C ABI binding generation code') | ||
| parser_gen.add_argument('type', choices=('ompi', 'standard'), | ||
| help='generate the OMPI ABI functions or the standard ABI functions') | ||
| parser_gen.add_argument('source_file', help='template file to use for C code generation') | ||
| parser_gen.set_defaults(handler=lambda args, out: c.generate_source(args, out)) | ||
| args = parser.parse_args() | ||
|
|
||
| # Pull in both generated python files and src files on import | ||
| sys.path.insert(0, os.path.join(args.builddir, 'ompi/mpi/bindings')) | ||
| sys.path.insert(0, os.path.join(args.srcdir, 'ompi/mpi/bindings')) | ||
| from ompi_bindings import c, fortran | ||
| from ompi_bindings.util import OutputFile | ||
|
|
||
| with open(args.output, 'w') as f: | ||
| args.handler(args, OutputFile(f)) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| main() |
Oops, something went wrong.