SQUASH_ME: OMNIBUS commit 6

git ignore additions

ABI library: don't include functions in 19.3.4/5

in the library as they are not part of the ABI.

fixes to handle count/offset/aint in abi.h

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

Author: hppritcha

.gitignore

@@ -537,6 +537,7 @@ docs/man
 ompi/mpi/c/*_generated*.c
 ompi/mpi/c/standard_*.c
 ompi/mpi/c/abi.h
+ompi/mpi/c/abi_get_info.c
 ompi/mpi/c/standard_abi
 
 # Generated Fortran Bindings

ompi/mpi/bindings/c_header.py

@@ -220,11 +220,28 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
          output.append(f"{binding[0]} P{' '.join(binding[1:])};\n")
 
 # ================================ Final Output ================================
-output.append("#endif /* _ABI_INTERNAL_ */")
+output.append("#if defined(__cplusplus)\n")
+output.append("}\n")
+output.append("#endif\n")
+output.append("#endif /* MPI_H_ABI */")
+# === some compilers are finicky about not having empy line at end of include file =====
+output.append("\n")
+
+#replacements = {'MPI_COUNT':'MPI_Count_ABI_INTERNAL',
+#                'MPI_AINT':'MPI_Aint_ABI_INTERNAL',
+#                'MPI_OFFSET':'MPI_Offset_ABI_INTERNAL'}
+replacements = {'MPI_COUNT':'MPI_Count',
+                'MPI_AINT':'MPI_Aint',
+                'MPI_OFFSET':'MPI_Offset'}
 
 for i, line in enumerate(output):
     line = line.replace(r"\ldots", "...")
+    for key, value in replacements.items():
+        if MANGLE_NAMES:
+            value = value+'_ABI_INTERNAL'
+        line = line.replace(f'@{key}@', value)
     if MANGLE_NAMES:
+
         # Replace datatypes with their internal ABI counterparts
         for datatype in INTERNAL_DATATYPES:
             # Need to include the extra space here or else we'll edit functions

ompi/mpi/c/Makefile.am

@@ -94,7 +94,6 @@ prototype_sources = \
         close_port.c.in \
         comm_accept.c.in \
         comm_attach_buffer.c.in \
-        comm_c2f.c.in \
         comm_call_errhandler.c.in \
 	comm_compare.c.in \
         comm_connect.c.in \
@@ -108,7 +107,6 @@ prototype_sources = \
         comm_disconnect.c.in \
         comm_dup.c.in \
         comm_dup_with_info.c.in \
-        comm_f2c.c.in \
         comm_flush_buffer.c.in \
         comm_free.c.in \
         comm_free_keyval.c.in \
@@ -141,20 +139,16 @@ prototype_sources = \
 	dist_graph_create.c.in \
 	dist_graph_neighbors.c.in \
 	dist_graph_neighbors_count.c.in \
-        errhandler_c2f.c.in \
-        errhandler_f2c.c.in \
 	errhandler_free.c.in \
 	error_class.c.in \
 	error_string.c.in \
 	exscan.c.in \
 	exscan_init.c.in \
 	fetch_and_op.c.in \
-	file_c2f.c.in \
 	file_call_errhandler.c.in \
 	file_close.c.in \
 	file_create_errhandler.c.in \
 	file_delete.c.in \
-	file_f2c.c.in \
 	file_get_amode.c.in \
 	file_get_atomicity.c.in \
 	file_get_byte_offset.c.in \
@@ -235,11 +229,9 @@ prototype_sources = \
 	graph_neighbors_count.c.in \
 	grequest_complete.c.in \
 	grequest_start.c.in \
-	group_c2f.c.in \
 	group_compare.c.in \
 	group_difference.c.in \
 	group_excl.c.in \
-	group_f2c.c.in \
 	group_free.c.in \
 	group_from_session_pset.c.in \
 	group_incl.c.in \
@@ -268,12 +260,10 @@ prototype_sources = \
         ineighbor_alltoall.c.in \
 	ineighbor_alltoallv.c.in \
 	ineighbor_alltoallw.c.in \
-	info_c2f.c.in \
 	info_create.c.in \
 	info_create_env.c.in \
 	info_delete.c.in \
 	info_dup.c.in \
-	info_f2c.c.in \
 	info_free.c.in \
 	info_get.c.in \
 	info_get_nkeys.c.in \
@@ -303,8 +293,6 @@ prototype_sources = \
 	issend.c.in \
 	is_thread_main.c.in \
 	lookup_name.c.in \
-        message_c2f.c.in \
-        message_f2c.c.in \
 	mprobe.c.in \
 	mrecv.c.in \
 	neighbor_allgather.c.in \
@@ -318,11 +306,9 @@ prototype_sources = \
 	neighbor_alltoallw.c.in \
 	neighbor_alltoallw_init.c.in \
         open_port.c.in \
-	op_c2f.c.in \
 	op_commutative.c.in \
 	op_create.c.in \
 	op_free.c.in \
-	op_f2c.c.in \
 	pack.c.in \
 	pack_external.c.in \
 	pack_external_size.c.in \
@@ -348,8 +334,6 @@ prototype_sources = \
 	reduce_scatter.c.in \
 	reduce_scatter_init.c.in \
 	register_datarep.c.in \
-        request_c2f.c.in \
-        request_f2c.c.in \
 	remove_error_class.c.in \
 	remove_error_code.c.in \
 	remove_error_string.c.in \
@@ -374,11 +358,11 @@ prototype_sources = \
 	sendrecv.c.in \
 	sendrecv_replace.c.in \
 	session_attach_buffer.c.in \
-	session_c2f.c.in \
 	session_call_errhandler.c.in \
 	session_create_errhandler.c.in \
 	session_detach_buffer.c.in \
-	session_f2c.c.in \
+	session_call_errhandler.c.in \
+	session_create_errhandler.c.in \
 	session_finalize.c.in \
 	session_flush_buffer.c.in \
 	session_get_errhandler.c.in \
@@ -393,12 +377,6 @@ prototype_sources = \
 	ssend_init.c.in \
 	startall.c.in \
 	start.c.in \
-	status_c2f08.c.in \
-	status_c2f.c.in \
-	status_f082c.c.in \
-	status_f082f.c.in \
-	status_f2c.c.in \
-	status_f2f08.c.in \
         status_get_error.c.in \
         status_get_source.c.in \
         status_get_tag.c.in \
@@ -414,7 +392,6 @@ prototype_sources = \
 	test_cancelled.c.in \
 	testsome.c.in \
 	topo_test.c.in \
-	type_c2f.c.in \
 	type_commit.c.in \
 	type_contiguous.c.in \
 	type_create_darray.c.in \
@@ -431,7 +408,6 @@ prototype_sources = \
 	type_create_subarray.c.in \
 	type_delete_attr.c.in \
 	type_dup.c.in \
-	type_f2c.c.in \
 	type_free.c.in \
 	type_free_keyval.c.in \
 	type_get_attr.c.in \
@@ -458,7 +434,6 @@ prototype_sources = \
 	win_allocate.c.in \
 	win_allocate_shared.c.in \
         win_attach.c.in \
-        win_c2f.c.in \
         win_call_errhandler.c.in \
         win_complete.c.in  \
 	win_create.c.in \
@@ -474,7 +449,6 @@ prototype_sources = \
         win_flush_local.c.in \
 	win_free.c.in \
         win_free_keyval.c.in \
-	win_f2c.c.in \
 	win_get_attr.c.in \
 	win_get_errhandler.c.in \
 	win_get_group.c.in \
@@ -496,18 +470,49 @@ prototype_sources = \
 	win_wait.c.in \
         wtime.c.in
 
-EXTRA_DIST = $(prototype_sources)
+# See MPI-5 standard Chapter 20 section 4
+prototype_sources_not_in_abi = \
+        comm_c2f.c.in \
+        errhandler_c2f.c.in \
+        file_c2f.c.in \
+        group_c2f.c.in \
+        info_c2f.c.in \
+        message_c2f.c.in \
+        op_c2f.c.in \
+        request_c2f.c.in \
+        session_c2f.c.in \
+        status_c2f08.c.in \
+        status_c2f.c.in \
+	status_f082c.c.in \
+	status_f082f.c.in \
+	status_f2f08.c.in \
+        type_c2f.c.in \
+        win_c2f.c.in \
+        comm_f2c.c.in \
+        errhandler_f2c.c.in \
+        file_f2c.c.in \
+        group_f2c.c.in \
+        info_f2c.c.in \
+        message_f2c.c.in \
+        op_f2c.c.in \
+        request_f2c.c.in \
+        session_f2c.c.in \
+        status_f2c.c.in \
+        type_f2c.c.in \
+        win_f2c.c.in
+
+EXTRA_DIST = $(prototype_sources) \
+	$(prototype_sources_not_in_abi) \
+	abi_converters.h \
+	abi_get_info.c.in
 
 # attr_fn.c contains attribute manipulation functions which do not
 # profiling implications, and so are always built.
 libmpi_c_la_SOURCES = \
         attr_fn.c
 
-# The MPI_Abi_* functions do not require profiling implementations.
+# functions that do not require profiling implementations.
 libmpi_c_la_SOURCES += \
-         abi_details.c \
-         abi_supported.c \
-         abi_version.c \
 	 ompi_isendrecv.c \
 	 ompi_sendrecv.c
 
@@ -523,7 +528,8 @@ nobase_include_HEADERS = abi.h standard_abi/mpi.h
 # generated from prototype_sources above).
 #
 #
-interface_profile_sources = $(prototype_sources:.c.in=_ompi_generated.c)
+interface_profile_sources = $(prototype_sources:.c.in=_ompi_generated.c) \
+	$(prototype_sources_not_in_abi:.c.in=_ompi_generated.c)
 
 
 # Conditionally install the header files
@@ -607,7 +613,7 @@ abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings
 	    $<
 endif
 
-MAINTAINERCLEANFILES = *_generated.c $(nobase_include_HEADERS)
+MAINTAINERCLEANFILES = *_generated.c abi_get_info.c abi_get_version.c $(nobase_include_HEADERS)
 if OMPI_STANDARD_ABI
 include Makefile_abi.include
 endif

ompi/mpi/c/Makefile_abi.include

@@ -40,11 +40,20 @@ BUILT_SOURCES = abi.h standard_abi/mpi.h
 
 libmpi_c_abi_la_SOURCES = \
         attr_fn.c \
-        abi_details.c \
-        abi_supported.c \
-        abi_version.c
+        abi_get_info.c \
+        abi_get_version.c
 
-libmpi_c_abi_la_CPPFLAGS = -DOMPI_NO_MPI_PROTOTYPES
+abi_get_info.c: abi_get_info.c.in
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
+	    --builddir $(abs_top_builddir) \
+	    --srcdir $(abs_top_srcdir) \
+	    --output $@ \
+	    c \
+	    source \
+	    standard \
+	    $<
+
+libmpi_c_abi_la_CPPFLAGS = -DOMPI_NO_MPI_PROTOTYPES -DOMPI_BUILD_MPI_PROFILING=0 -DOMPI_BUILD_STANDARD_ABI
 libmpi_c_abi_la_LIBADD = libmpi_c_abi_profile.la
 if BUILD_MPI_BINDINGS_LAYER
 libmpi_c_abi_la_LIBADD += libmpi_c_abi_noprofile.la

ompi/mpi/c/abi.h.in

@@ -1,21 +1,16 @@
-/*
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
+#ifndef MPI_H_ABI
+#define MPI_H_ABI
 
-#ifndef _ABI_INTERNAL_
-#define _ABI_INTERNAL_
+#include <stddef.h>
+#include <stdint.h>
 
-/* TODO: figure out which includes we need, change to <> instead of "" */
-#include "stddef.h"
-#include "stdint.h"
-
-/* #include <stdint.h> */
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
+#undef MPI_VERSION
 #define MPI_VERSION    5
+#undef MPI_SUBVERSION
 #define MPI_SUBVERSION 0
 
 #define MPI_ABI_VERSION    1
@@ -34,29 +29,29 @@ typedef struct MPI_ABI_Request * MPI_Request;
 typedef struct MPI_ABI_Session * MPI_Session;
 typedef struct MPI_ABI_Win * MPI_Win;
 
-/* /\* MPI_Aint is defined to be intptr_t (or equivalent to it, if compiler support is absent). */
-/*  * The only acceptable alternative to intptr_t is the C89 type equivalent to it. *\/ */
-/* #if !defined(MPI_ABI_Aint) */
-/* #define MPI_ABI_Aint intptr_t */
-/* #endif */
-/* typedef MPI_ABI_Aint MPI_Aint; */
-/* #undef  MPI_ABI_Aint */
-
-/* /\* MPI_Offset will be 64b on all relevant systems. */
-/*  * We allow for MPI implementations supporting for 128b filesystems. *\/ */
-/* #if !defined(MPI_ABI_Offset) */
-/* #define MPI_ABI_Offset int64_t */
-/* #endif */
-/* typedef MPI_ABI_Offset MPI_Offset; */
-/* #undef  MPI_ABI_Offset */
-
-/* /\* MPI_Count must be large enough to hold the larger of MPI_Aint and MPI_Offset. */
-/*  * Platforms where MPI_Aint is larger than MPI_Offset are extremely rare. *\/ */
-/* #if !defined(MPI_ABI_Count) */
-/* #define MPI_ABI_Count MPI_Offset */
-/* #endif */
-/* typedef MPI_ABI_Count MPI_Count; */
-/* #undef  MPI_ABI_Count */
+/* MPI_Aint is defined to be intptr_t (or equivalent to it, if compiler support is absent).
+ * The only acceptable alternative to intptr_t is the C89 type equivalent to it. */
+#if !defined(MPI_ABI_Aint)
+#define MPI_ABI_Aint intptr_t
+#endif
+typedef MPI_ABI_Aint @MPI_AINT@;
+#undef  MPI_ABI_Aint
+
+/* MPI_Offset will be 64b on all relevant systems.
+ * We allow for MPI implementations supporting for 128b filesystems. */
+#if !defined(MPI_ABI_Offset)
+#define MPI_ABI_Offset int64_t
+#endif
+typedef MPI_ABI_Offset @MPI_OFFSET@;
+#undef  MPI_ABI_Offset
+
+/* MPI_Count must be large enough to hold the larger of MPI_Aint and MPI_Offset.
+ * Platforms where MPI_Aint is larger than MPI_Offset are extremely rare. */
+#if !defined(MPI_ABI_Count)
+#define MPI_ABI_Count MPI_Offset
+#endif
+typedef MPI_ABI_Count @MPI_COUNT@;
+#undef  MPI_ABI_Count
 
 typedef struct {
   int MPI_SOURCE;
@@ -211,3 +206,4 @@ $CATEGORY:TOOL_INFO_IFACE_SOURCE_ORDERINGS$
  * Callback safety requirement levels used in the MPI tool information interface
  */
 $CATEGORY:TOOL_INFO_IFACE_CB_SAFETY_REQ_LEVELS$
+