ABI: Move ABI support into big count binding code

Implement lots of missing functionality in the original
api.py script.  The functionality is now part of the
bindings generation framework used for Big Count.

Number of todos still to do, in particular provide
support for wrapping user supplied callback functions.
Also, the sendrecv_replace, etc. code needs to be
refactored to work with the bindings framework.

to heed the --enable-abi-standard config option

Additional initial fixes to merging ABI support into big count
framework.

Co-authored-by: Jake Tronge <[email protected]>
Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

.gitignore

@@ -535,7 +535,6 @@ docs/man
 
 # Generated C Bindings
 ompi/mpi/c/*_generated*.c
-ompi/mpi/c/ompi_*.c
 ompi/mpi/c/standard_*.c
 ompi/mpi/c/abi.h
 ompi/mpi/c/standard_abi

config/ompi_configure_options.m4

@@ -256,6 +256,12 @@ AM_CONDITIONAL(OMPI_OMPIO_SUPPORT, test "$ompi_want_ompio" = "1")
 AC_ARG_ENABLE([deprecate-mpif-h],
               [AS_HELP_STRING([--enable-deprecate-mpif-h],
                               [Mark the mpif.h bindings as deprecated (default: enabled)])])
+# If the binding source files don't exist, then we need Python to generate them
+AM_PATH_PYTHON([3.6],,[:])
+binding_file="${srcdir}/ompi/mpi/c/ompi_send_generated.c"
+AS_IF([! test -e "$binding_file" && test "$PYTHON" = ":"],
+      [AC_MSG_ERROR([Open MPI requires Python >=3.6 for generating the bindings. Aborting])])
+AM_CONDITIONAL(OMPI_GENERATE_BINDINGS,[test "$PYTHON" != ":"])
 
 AC_MSG_CHECKING([if want to enable standard ABI library])
 AC_ARG_ENABLE([standard-abi],

ompi/Makefile.am

@@ -126,7 +126,7 @@ DIST_SUBDIRS = \
         $(MCA_ompi_FRAMEWORKS_SUBDIRS) \
         $(MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
 
-noinst_LTLIBRARIES = libopen-mpi.la
+noinst_LTLIBRARIES = libopen_mpi.la
 lib_LTLIBRARIES = lib@[email protected]
 if OMPI_STANDARD_ABI
 lib_LTLIBRARIES += libmpi_abi.la
@@ -142,14 +142,14 @@ endif
 # +----------------------+----------------------+
 # |     libmpi_abi.la    |        libmpi.la     |
 # +----------------------+----------------------+
-# |              libopen-mpi.la                 |
+# |              libopen_mpi.la                 |
 # +----------------------+----------------------+
 #
-# This includes a new library, libopen-mpi.la, that links in all backend code
+# This includes a new library, libopen_mpi.la, that links in all backend code
 # built in this directory or SUBDIRs of this directory. Previously everything
 # was just linked directly into libmpi.la (lib@[email protected]).
 #
-# libmpi_abi.la and libmpi.la both now link in libopen-mpi.la, the only
+# libmpi_abi.la and libmpi.la both now link in libopen_mpi.la, the only
 # difference between them being that one includes the standard ABI functions
 # and the other the ompi-specific versions of those.
 #
@@ -167,7 +167,7 @@ libopen_mpi_la_DEPENDENCIES = $(libopen_mpi_la_LIBADD)
 # Build the main MPI library
 lib@OMPI_LIBMPI_NAME@_la_SOURCES =
 lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
-	libopen-mpi.la \
+	libopen_mpi.la \
         mpi/c/libmpi_c.la \
         mpi/tool/libmpi_mpit.la \
         $(c_mpi_lib) \
@@ -182,16 +182,16 @@ lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
 # The MPI Standard ABI library
 libmpi_abi_la_SOURCES =
 libmpi_abi_la_LIBADD = \
-        libopen-mpi.la \
+        libopen_mpi.la \
 	mpi/c/libmpi_c_abi.la
 
 # included subdirectory Makefile.am's and appended-to variables
 headers =
-noinst_LTLIBRARIES =
 include_HEADERS =
 EXTRA_DIST =
 lib@OMPI_LIBMPI_NAME@_la_SOURCES += $(headers)
 dist_ompidata_DATA =
+libopen_mpi_la_SOURCES += $(headers)
 
 # Conditionally install the header files
 

ompi/attribute/attribute.c

@@ -322,6 +322,7 @@ do { \
     /* C style */ \
     else { \
         void *attr_val = translate_to_c(attribute); \
+        /* TODO: NEED SUPPORT FOR ABI */ \
         err = (*((keyval_obj->delete_attr_fn).attr_##type##_delete_fn)) \
             ((ompi_##type##_t *)object,                                 \
              key, attr_val,                                             \
@@ -381,6 +382,7 @@ do { \
     else { \
         void *in, *out; \
         in = translate_to_c(in_attr); \
+        /* TODO: NEED SUPPORT FOR ABI */ \
         if ((err = (*((keyval_obj->copy_attr_fn).attr_##type##_copy_fn)) \
               ((ompi_##type##_t *)old_object, key, keyval_obj->extra_state.c_ptr, \
                in, &out, &flag)) == MPI_SUCCESS) { \

ompi/attribute/attribute.h

@@ -50,6 +50,7 @@
 #define OMPI_KEYVAL_PREDEFINED     0x0001
 #define OMPI_KEYVAL_F77            0x0002
 #define OMPI_KEYVAL_F77_INT        0x0004
+#define OMPI_KEYVAL_ABI            0x0008
 
 
 BEGIN_C_DECLS
@@ -136,7 +137,7 @@ struct ompi_attribute_keyval_t {
                                        copy/delete attribute functions
                                        properly and error checking */
     int attr_flag; /**< flag field: contains "OMPI_KEYVAL_PREDEFINED",
-                      "OMPI_KEYVAL_F77"  */
+                      "OMPI_KEYVAL_F77", "OMPI_KEYVAL_ABI", etc.  */
     ompi_attribute_fn_ptr_union_t copy_attr_fn; /**< Copy function for the
                                              attribute */
     ompi_attribute_fn_ptr_union_t delete_attr_fn; /**< Delete function for the

ompi/include/mpi.h.in

@@ -1451,6 +1451,7 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_ub;
 /*
  * MPI API
  */
+#ifndef OMPI_NO_MPI_PROTOTYPES
 OMPI_DECLSPEC  int MPI_Abi_supported(int *flag);
 OMPI_DECLSPEC  int MPI_Abi_version(int *abi_major, int *abi_minor);
 OMPI_DECLSPEC  int MPI_Abi_details(int *buflen, char *details, MPI_Info *info);
@@ -4172,6 +4173,7 @@ OMPI_DECLSPEC  int PMPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
 
 #endif /* OMPI_NO_MPI_PROTOTYPES */
 
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif