Updated ABI generation code and new libraries

.gitignore

@@ -271,6 +271,7 @@ ompi/tools/ompi_info/ompi_info
 
 ompi/tools/wrappers/mpic++-wrapper-data.txt
 ompi/tools/wrappers/mpicc-wrapper-data.txt
+ompi/tools/wrappers/mpicc_abi-wrapper-data.txt
 ompi/tools/wrappers/mpifort-wrapper-data.txt
 ompi/tools/wrappers/ompi_wrapper_script
 ompi/tools/wrappers/ompi.pc
@@ -534,6 +535,9 @@ docs/man
 
 # Generated C Bindings
 ompi/mpi/c/*_generated*.c
+ompi/mpi/c/standard_*.c
+ompi/mpi/c/abi.h
+ompi/mpi/c/standard_abi
 
 # Generated Fortran Bindings
 ompi/mpi/fortran/use-mpi-f08/*_generated.F90

config/ompi_config_files.m4

@@ -48,6 +48,7 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/tools/ompi_info/Makefile
         ompi/tools/wrappers/Makefile
         ompi/tools/wrappers/mpicc-wrapper-data.txt
+        ompi/tools/wrappers/mpicc_abi-wrapper-data.txt
         ompi/tools/wrappers/mpic++-wrapper-data.txt
         ompi/tools/wrappers/mpifort-wrapper-data.txt
         ompi/tools/wrappers/ompi.pc

config/ompi_configure_options.m4

@@ -256,5 +256,26 @@ 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],
+    [AS_HELP_STRING([--enable-standard-abi],
+                    [Enable building the standard ABI library (default: disabled)])])
+if test "$enable_standard_abi" = "yes"; then
+    AC_MSG_RESULT([yes])
+    ompi_standard_abi=1
+else
+    AC_MSG_RESULT([no])
+    ompi_standard_abi=0
+fi
+AC_DEFINE_UNQUOTED([OMPI_STANDARD_ABI],[$ompi_standard_abi],
+                   [Whether we want to build the standard ABI library])
+AM_CONDITIONAL(OMPI_STANDARD_ABI,[test "$enable_standard_abi" = "yes"])
 
 ])dnl

ompi/Makefile.am

@@ -126,36 +126,72 @@ DIST_SUBDIRS = \
         $(MCA_ompi_FRAMEWORKS_SUBDIRS) \
         $(MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
 
-# Build the main MPI library
-
+noinst_LTLIBRARIES = libopen_mpi.la
 lib_LTLIBRARIES = lib@[email protected]
-lib@OMPI_LIBMPI_NAME@_la_SOURCES =
-lib@OMPI_LIBMPI_NAME@_la_LIBADD = \
+if OMPI_STANDARD_ABI
+lib_LTLIBRARIES += libmpi_abi.la
+endif
+
+#
+# ABI Refactor
+#
+# As required by the standard ABI, ompi must now provide libmpi_abi.la for
+# ABI-specific code. Since we also want to avoid breaking the existing ompi
+# ABI, the libraries in this directory are now organized as follows:
+#
+# +----------------------+----------------------+
+# |     libmpi_abi.la    |        libmpi.la     |
+# +----------------------+----------------------+
+# |              libopen_mpi.la                 |
+# +----------------------+----------------------+
+#
+# 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
+# difference between them being that one includes the standard ABI functions
+# and the other the ompi-specific versions of those.
+#
+
+# Build the Open MPI internal library
+libopen_mpi_la_SOURCES =
+libopen_mpi_la_LIBADD = \
         datatype/libdatatype.la \
         debuggers/libdebuggers.la \
+        $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected] \
+        $(MCA_ompi_FRAMEWORK_LIBS) \
+        $(OMPI_LIBMPI_EXTRA_LIBS)
+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 \
         mpi/c/libmpi_c.la \
         mpi/tool/libmpi_mpit.la \
         $(c_mpi_lib) \
         $(c_pmpi_lib) \
-        $(mpi_fortran_base_lib) \
-        $(MCA_ompi_FRAMEWORK_LIBS) \
         $(OMPI_MPIEXT_C_LIBS) \
-        $(OMPI_LIBMPI_EXTRA_LIBS)
+        $(mpi_fortran_base_lib)
 
-
-lib@OMPI_LIBMPI_NAME@_la_LIBADD += \
-        $(OMPI_TOP_BUILDDIR)/opal/lib@[email protected]
-lib@OMPI_LIBMPI_NAME@_la_DEPENDENCIES = $(lib@OMPI_LIBMPI_NAME@_la_LIBADD)
 lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
        -version-info $(libmpi_so_version) \
         $(OMPI_LIBMPI_EXTRA_LDFLAGS)
 
+# The MPI Standard ABI library
+libmpi_abi_la_SOURCES =
+libmpi_abi_la_LIBADD = \
+        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/Makefile.am

@@ -22,6 +22,6 @@
 headers += \
         attribute/attribute.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         attribute/attribute.c \
         attribute/attribute_predefined.c

ompi/class/Makefile.am

@@ -23,6 +23,5 @@
 headers += \
         class/ompi_seq_tracker.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         class/ompi_seq_tracker.c
-

ompi/communicator/Makefile.am

@@ -29,14 +29,14 @@ headers += \
         communicator/communicator.h \
 	communicator/comm_request.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         communicator/comm_init.c \
 	communicator/comm.c \
 	communicator/comm_cid.c \
 	communicator/comm_request.c
 
 if WANT_FT_MPI
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
 	communicator/ft/comm_ft.c communicator/ft/comm_ft_reliable_bcast.c communicator/ft/comm_ft_propagator.c communicator/ft/comm_ft_detector.c communicator/ft/comm_ft_revoke.c
 endif # WANT_FT_MPI
 

ompi/dpm/Makefile.am

@@ -17,5 +17,5 @@ EXTRA_DIST += dpm/help-dpm.txt
 headers += \
         dpm/dpm.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         dpm/dpm.c

ompi/errhandler/Makefile.am

@@ -30,7 +30,7 @@ headers += \
         errhandler/errhandler.h \
         errhandler/errhandler_predefined.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         errhandler/errhandler.c \
         errhandler/errhandler_invoke.c \
         errhandler/errhandler_predefined.c \

ompi/file/Makefile.am

@@ -22,5 +22,5 @@
 headers += \
         file/file.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         file/file.c

ompi/group/Makefile.am

@@ -25,7 +25,7 @@ headers += \
         group/group.h \
 	group/group_dbg.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         group/group.c \
         group/group_init.c \
         group/group_set_rank.c \

ompi/include/mpi.h.in

@@ -1433,6 +1433,10 @@ 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);
 OMPI_DECLSPEC  int MPI_Abort(MPI_Comm comm, int errorcode);
 OMPI_DECLSPEC  int MPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
                                   int target_rank, MPI_Aint target_disp, int target_count,
@@ -2169,8 +2173,6 @@ OMPI_DECLSPEC  int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int sou
                             int tag, MPI_Comm comm, MPI_Status *status);
 OMPI_DECLSPEC  int MPI_Recv_c(void *buf, MPI_Count count, MPI_Datatype datatype, int source,
                               int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Recv_c(void *buf, MPI_Count count, MPI_Datatype datatype, int source,
-                              int tag, MPI_Comm comm, MPI_Status *status);
 OMPI_DECLSPEC  int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                               MPI_Op op, int root, MPI_Comm comm);
 OMPI_DECLSPEC  int MPI_Reduce_c(const void *sendbuf, void *recvbuf, MPI_Count count, MPI_Datatype datatype,
@@ -3328,8 +3330,6 @@ OMPI_DECLSPEC  int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int so
                              int tag, MPI_Comm comm, MPI_Status *status);
 OMPI_DECLSPEC  int PMPI_Recv_c(void *buf, MPI_Count count, MPI_Datatype datatype, int source,
                                int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Recv_c(void *buf, MPI_Count count, MPI_Datatype datatype, int source,
-                               int tag, MPI_Comm comm, MPI_Status *status);
 OMPI_DECLSPEC  int PMPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
                                MPI_Op op, int root, MPI_Comm comm);
 OMPI_DECLSPEC  int PMPI_Reduce_c(const void *sendbuf, void *recvbuf, MPI_Count count, MPI_Datatype datatype,
@@ -4092,6 +4092,9 @@ OMPI_DECLSPEC  int PMPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub)
 #define MPI_Type_ub(...)  THIS_FUNCTION_WAS_REMOVED_IN_MPI30(MPI_Type_ub, MPI_Type_get_extent)
 #endif
 
+#endif /* OMPI_NO_MPI_PROTOTYPES */
+
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif

ompi/instance/Makefile.am

@@ -23,4 +23,4 @@
 
 headers += instance/instance.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += instance/instance.c
+libopen_mpi_la_SOURCES += instance/instance.c

ompi/interlib/Makefile.am

@@ -25,5 +25,5 @@
 headers += \
         interlib/interlib.h
 
-lib@OMPI_LIBMPI_NAME@_la_SOURCES += \
+libopen_mpi_la_SOURCES += \
         interlib/interlib.c

ompi/mca/bml/r2/Makefile.am

@@ -37,7 +37,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_bml_r2_la_SOURCES = $(r2_sources)
 mca_bml_r2_la_LDFLAGS = -module -avoid-version
-mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_bml_r2_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_bml_r2_la_SOURCES = $(r2_sources)

ompi/mca/coll/basic/Makefile.am

@@ -63,7 +63,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_basic_la_SOURCES = $(sources)
 mca_coll_basic_la_LDFLAGS = -module -avoid-version
-mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_basic_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_basic_la_SOURCES =$(sources)

ompi/mca/coll/demo/Makefile.am

@@ -57,7 +57,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_demo_la_SOURCES = $(sources)
 mca_coll_demo_la_LDFLAGS = -module -avoid-version
-mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_demo_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_demo_la_SOURCES = $(sources)

ompi/mca/coll/hcoll/Makefile.am

@@ -39,7 +39,7 @@ endif
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES  = $(component_install)
 mca_coll_hcoll_la_SOURCES = $(coll_hcoll_sources)
-mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_coll_hcoll_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
 	$(coll_hcoll_LIBS)
 mca_coll_hcoll_la_LDFLAGS = -module -avoid-version $(coll_hcoll_LDFLAGS)
 

ompi/mca/coll/inter/Makefile.am

@@ -34,7 +34,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_inter_la_SOURCES = $(sources)
 mca_coll_inter_la_LDFLAGS = -module -avoid-version
-mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_inter_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_inter_la_SOURCES = $(sources)

ompi/mca/coll/libnbc/Makefile.am

@@ -72,7 +72,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_libnbc_la_SOURCES = $(sources)
 mca_coll_libnbc_la_LDFLAGS = -module -avoid-version
-mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_libnbc_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_libnbc_la_SOURCES =$(sources)

ompi/mca/coll/monitoring/Makefile.am

@@ -46,7 +46,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_monitoring_la_SOURCES = $(monitoring_sources)
 mca_coll_monitoring_la_LDFLAGS = -module -avoid-version
-mca_coll_monitoring_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_coll_monitoring_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
 	$(OMPI_TOP_BUILDDIR)/ompi/mca/common/monitoring/libmca_common_monitoring.la
 
 noinst_LTLIBRARIES = $(component_noinst)

ompi/mca/coll/portals4/Makefile.am

@@ -33,7 +33,7 @@ AM_CPPFLAGS = $(coll_portals4_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_portals4_la_SOURCES = $(local_sources)
-mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_coll_portals4_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
 	$(coll_portals4_LIBS)
 mca_coll_portals4_la_LDFLAGS = -module -avoid-version $(coll_portals4_LDFLAGS)
 

ompi/mca/coll/self/Makefile.am

@@ -55,7 +55,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_self_la_SOURCES = $(sources)
 mca_coll_self_la_LDFLAGS = -module -avoid-version
-mca_coll_self_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_self_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_self_la_SOURCES =$(sources)

ompi/mca/coll/sync/Makefile.am

@@ -46,7 +46,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_sync_la_SOURCES = $(sources)
 mca_coll_sync_la_LDFLAGS = -module -avoid-version
-mca_coll_sync_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_sync_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_sync_la_SOURCES =$(sources)

ompi/mca/coll/tuned/Makefile.am

@@ -61,7 +61,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_tuned_la_SOURCES = $(sources)
 mca_coll_tuned_la_LDFLAGS = -module -avoid-version
-mca_coll_tuned_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la
+mca_coll_tuned_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la
 
 noinst_LTLIBRARIES = $(component_noinst)
 libmca_coll_tuned_la_SOURCES =$(sources)

ompi/mca/coll/ucc/Makefile.am

@@ -50,7 +50,7 @@ endif
 mcacomponentdir          = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_coll_ucc_la_SOURCES  = $(coll_ucc_sources)
-mca_coll_ucc_la_LIBADD   = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_coll_ucc_la_LIBADD   = $(top_builddir)/ompi/libopen-mpi.la \
 	                     $(coll_ucc_LIBS)
 mca_coll_ucc_la_LDFLAGS  = -module -avoid-version $(coll_ucc_LDFLAGS)
 

ompi/mca/common/monitoring/Makefile.am

@@ -34,7 +34,7 @@ endif
 ompi_monitoring_prof_la_LDFLAGS= \
     -module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
 ompi_monitoring_prof_la_LIBADD = \
-    $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+    $(top_builddir)/ompi/libopen-mpi.la \
     $(top_builddir)/opal/lib@[email protected]
 
 if OPAL_INSTALL_BINARIES

ompi/mca/fbtl/ime/Makefile.am

@@ -30,7 +30,7 @@ AM_CPPFLAGS = $(fbtl_ime_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_ime_la_SOURCES = $(fbtl_ime_sources)
-mca_fbtl_ime_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_fbtl_ime_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
 	$(fbtl_ime_LIBS)
 mca_fbtl_ime_la_LDFLAGS = -module -avoid-version $(fbtl_ime_LDFLAGS)
 

ompi/mca/fbtl/posix/Makefile.am

@@ -34,7 +34,7 @@ mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fbtl_posix_la_SOURCES = $(sources)
 mca_fbtl_posix_la_LDFLAGS = -module -avoid-version
-mca_fbtl_posix_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_fbtl_posix_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
     $(OMPI_TOP_BUILDDIR)/ompi/mca/common/ompio/libmca_common_ompio.la
 
 noinst_LTLIBRARIES = $(component_noinst)

ompi/mca/fs/ime/Makefile.am

@@ -37,7 +37,7 @@ AM_CPPFLAGS = $(fs_ime_CPPFLAGS)
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
 mca_fs_ime_la_SOURCES = $(fs_ime_sources)
-mca_fs_ime_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \
+mca_fs_ime_la_LIBADD = $(top_builddir)/ompi/libopen-mpi.la \
         $(fs_ime_LIBS)
 mca_fs_ime_la_LDFLAGS = -module -avoid-version $(fs_ime_LDFLAGS)