SQUASH_ME: OMNIBUS commit 4

abi_fortran: add support for LOGICAL16

logical16 patch

missed something

add comm_from/toint

simpler to hard code abi/ompi variants.
For ABI version add an offset to the values normally
used for original "f2c/c2f" ops to push the values normally
returned by "c2f" functions to be greater than any ABI
defined constants.

complete toint/fromint interfaces

basic implementation checks if constant is <= 16384
(the largest value reserved for mpi abi constants)
and returns the constant back or looks up the value
in the relevant array of pointers and offsets by 16385.

fix error return values for ABI routines

somehow was using the wrong converter to translate
ompi intern error values with abi ones.
Many are actually the same but that's just by chance.

minor fixup for toint/fromint

rebase fix

handle TAG more correctly

even though currently MPI_ANY_TAG is the same in ABI and OMPI

squash compiler warning

add hooks for TAG_OUT type

add better support for MPI_ROOT and source

since MPI_ROOT for ABI is not equal to ompi.
MPI_ANY_SOURCE is but still generate conversion code
rather than just beining lucky.

squash a compiler warning

this fix kind of messes up the indenter so the resulting line
in the generated code isn't nicely indented but that can be fixed later.

some fixes to comm attributes wrappers

also see about fixing an issue with some of the ompi
mca components when using --enable-mca-dso.

fix bug in comm attr copy code

some fixes for attributes and more

to start using the ompi-tests/ibm had to complete adding
MPI_T_ to the abi.

Also some other fixes.

Attributes still need more work.

checkpoint

many changes.  go back to generating abi_converters.h
fix up tools for abi case, etc.

fix for datatype converters

distcheck fix

EVENT_INSTANCE: arg type cast fix

and add in a file that wasn't in the makefile!

MPI_ROOT: capture proc null type too

needed to get a lot of intercommunicator collectives to pass.

requests: fixes to some multirequest test functions

weights and source out support/fixes

fixes problems with dist graph constructors
and cart_shift output.

some fixes for message related functions

also add better support for the 'some' test/wait functions.

fix testall and startall

fix mpi4py break

fix a few problems with datatype bindings

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

Author: hppritcha

ompi/Makefile.am

@@ -183,7 +183,8 @@ lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
 libmpi_abi_la_SOURCES =
 libmpi_abi_la_LIBADD = \
         libopen_mpi.la \
-	mpi/c/libmpi_c_abi.la
+	mpi/c/libmpi_c_abi.la \
+	mpi/tool/libmpi_mpit_abi.la
 
 # included subdirectory Makefile.am's and appended-to variables
 headers =

ompi/include/mpi.h.in

@@ -31,3 +31,14 @@ EXTRA_DIST += \
         mpi/bindings/ompi_bindings/fortran.py \
         mpi/bindings/ompi_bindings/fortran_type.py \
         mpi/bindings/ompi_bindings/util.py
+
+#
+# attr_fn.c needs to be slurped into libopen_mpi
+# as it defines the OMPI native variants of
+# built-in copy/del attribute functions are these
+# are used in some component plugins
+#
+
+libopen_mpi_la_SOURCES += \
+        mpi/c/attr_fn.c
+

ompi/mpi/Makefile.am

@@ -57,6 +57,8 @@ def main():
     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_header = subparsers_c.add_parser('converters', help='generate converter header file')
+    parser_header.set_defaults(handler=lambda args, out: c.generate_converters(args, out))
     parser_gen = subparsers_c.add_parser('source', help='generate source file from template file')
     # parser = argparse.ArgumentParser(description='C ABI binding generation code')
     parser_gen.add_argument('type', choices=('ompi', 'standard'),

ompi/mpi/bindings/bindings.py

@@ -51,6 +51,7 @@
     "MPI_T_event_instance",
     "MPI_T_event_registration",
     "MPI_T_cb_safety",
+    "MPI_T_source_order",
     # TODO: these two are deprecated, get rid of them
     "MPI_Copy_function",
     "MPI_Delete_function",
@@ -246,6 +247,26 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
          binding = proc.express.embiggen.iso_c.__str__().split()
          output.append(f"{binding[0]} P{' '.join(binding[1:])};\n")
 
+# ================================ Odds and ends for mangle case ===============
+if MANGLE_NAMES:
+    output.append("\n")
+    output.append("/*\n")
+    output.append(" * define externs to help with attributes\n")
+    output.append(" */\n")
+    output.append("extern int ompi_abi_mpi_proc_null_val;\n")
+    output.append("extern int ompi_abi_mpi_any_source_val;\n")
+    output.append("\n")
+    output.append("int ABI_C_MPI_COMM_NULL_DELETE_FN( MPI_Comm_ABI_INTERNAL comm, int comm_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_COMM_NULL_COPY_FN( MPI_Comm_ABI_INTERNAL  comm, int comm_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_COMM_DUP_FN( MPI_Comm_ABI_INTERNAL comm, int comm_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_TYPE_NULL_DELETE_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_TYPE_NULL_COPY_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_TYPE_DUP_FN( MPI_Datatype_ABI_INTERNAL datatype, int type_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_WIN_NULL_DELETE_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* attribute_val_out, void* extra_state );\n")
+    output.append("int ABI_C_MPI_WIN_NULL_COPY_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("int ABI_C_MPI_WIN_DUP_FN( MPI_Win_ABI_INTERNAL window, int win_keyval, void* extra_state, void* attribute_val_in, void* attribute_val_out, int* flag );\n")
+    output.append("\n")
+
 # ================================ Final Output ================================
 output.append("#if defined(__cplusplus)\n")
 output.append("}\n")