abi_get_version/get_info add to ompi abi lib

and correction major/minor versoin returned from the ABI
build.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/include/mpi.h.in

@@ -1453,9 +1453,8 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_ub;
 /*
  * MPI API
  */
-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_Abi_get_version(int *abi_major, int *abi_minor);
+OMPI_DECLSPEC  int MPI_Abi_get_info(MPI_Info *info);
 OMPI_DECLSPEC  int MPI_Abi_get_fortran_info(MPI_Info *info);
 OMPI_DECLSPEC  int MPI_Abi_set_fortran_info(MPI_Info info);
 OMPI_DECLSPEC  int MPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);
@@ -2656,9 +2655,8 @@ OMPI_DECLSPEC  double MPI_Wtime(void);
   /*
    * Profiling MPI API
    */
-OMPI_DECLSPEC  int PMPI_Abi_supported(int *flag);
-OMPI_DECLSPEC  int PMPI_Abi_version(int *abi_major, int *abi_minor);
-OMPI_DECLSPEC  int PMPI_Abi_details(int *buflen, char *details, MPI_Info *info);
+OMPI_DECLSPEC  int PMPI_Abi_get_version(int *abi_major, int *abi_minor);
+OMPI_DECLSPEC  int PMPI_Abi_get_info(MPI_Info *info);
 OMPI_DECLSPEC  int PMPI_Abi_get_fortran_info(MPI_Info *info);
 OMPI_DECLSPEC  int PMPI_Abi_set_fortran_info(MPI_Info info);
 OMPI_DECLSPEC  int PMPI_Abi_get_fortran_booleans(int logical_size, void *logical_true, void *logical_false, int *is_set);

ompi/mpi/c/Makefile.am

@@ -55,6 +55,8 @@ prototype_sources = \
         abi_set_fortran_info.c.in \
         abi_get_fortran_booleans.c.in \
         abi_set_fortran_booleans.c.in \
+        abi_get_info.c.in \
+        abi_get_version.c.in \
         abort.c.in \
         accumulate.c.in \
         add_error_class.c.in \

ompi/mpi/c/Makefile_abi.include

@@ -45,8 +45,6 @@ libmpi_c_abi_la_SOURCES = \
         ompi_abi_fortran.c
 
 extra_abi_fns = \
-        abi_get_info.c \
-        abi_get_version.c \
         aint_add_abi.c \
         aint_diff_abi.c \
         comm_fromint_abi.c \
@@ -75,16 +73,6 @@ extra_abi_fns = \
         wtick.c
 
 
-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

ompi/mpi/c/abi_get_info.c.in

@@ -17,16 +17,14 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/constants.h"
-#ifdef OMPI_NO_MPI_PROTOTYPES
-#include "ompi/mpi/c/abi.h"
-#endif
 
 PROTOTYPE ERROR_CLASS abi_get_info(INFO_OUT info)
 {
     int ret = OMPI_SUCCESS;
+
+#if OMPI_ABI_SRC
     ompi_info_t *newinfo = NULL;
     char tmp[16];
-
     newinfo = ompi_info_allocate();
     if (NULL == newinfo) {
         return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_NO_MEM,
@@ -52,10 +50,12 @@ PROTOTYPE ERROR_CLASS abi_get_info(INFO_OUT info)
     }
 
     *info = newinfo;
-    return ret;
-
 err_cleanup:
     ompi_info_free(&newinfo);
     return ret;
-    
+
+#else
+    *info = MPI_INFO_NULL;
+#endif
+    return ret;
 }

ompi/mpi/c/abi_get_version.c renamed to ompi/mpi/c/abi_get_version.c.in

@@ -17,21 +17,19 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/constants.h"
-#ifdef OMPI_NO_MPI_PROTOTYPES
-#include "ompi/mpi/c/abi.h"
-#endif
-
-#if OMPI_BUILD_MPI_PROFILING
-#if OPAL_HAVE_WEAK_SYMBOLS
-#pragma weak MPI_Abi_get_version = PMPI_Abi_get_version
-#endif
-#define MPI_Abi_get_version PMPI_Abi_get_version
-#endif
 
-int MPI_Abi_get_version(int *abi_major, int *abi_minor)
+PROTOTYPE ERROR_CLASS abi_get_version(INT_OUT abi_major, INT_OUT abi_minor)
 {
+/*
+ * For the curious see Chapter 20 section 2 of the MPI 5 standard
+ */
+#if OMPI_ABI_SRC
     /* 0.1 */
-    *abi_major = 0;
-    *abi_minor = 1;
+    *abi_major = 1;
+    *abi_minor = 0;
+#else
+    *abi_major = -1;
+    *abi_minor = -1;
+#endif
     return MPI_SUCCESS;
 }