Return MPI1 function implementations to build list

Adding the implementations of the functions that were removed
from the MPI standard to the build list, regardless of the
state of the OMPI_ENABLE_MPI1_COMPAT.

According to the README, we want the OMPI_ENABLE_MPI1_COMPAT
configure flag to control which MPI prototypes are exposed in
mpi.h, NOT, which are built into the mpi library.  Those will
remain in the mpi library until a future major release (5.0?)

NOTE: for the Fortran implementations, we instead define
      OMPI_OMIT_MPI1_COMPAT_DECLS to 0 instead of
      OMPI_ENABLE_MPI1_COMPAT to 1.  I'm not sure why, but
      this seems to work correctly.

Also changing the removed MPI_Errhandler_create implementation
to use the non removed MPI_Comm_errhandler_function prototype
(prototype remains unchanged from MPI_Comm_errhandler_fn)

Signed-off-by: Geoffrey Paulsen <[email protected]>

Author: gpaulsen

ompi/mpi/c/Makefile.am

@@ -437,7 +437,8 @@ libmpi_c_mpi_la_SOURCES = \
         win_wait.c
 
 
-if OMPI_ENABLE_MPI1_COMPAT
+# include all of the removed MPI functions in library
+# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
 libmpi_c_mpi_la_SOURCES += \
         address.c \
         errhandler_create.c \
@@ -449,7 +450,6 @@ libmpi_c_mpi_la_SOURCES += \
         type_lb.c \
         type_struct.c \
         type_ub.c
-endif
 
 # Conditionally install the header files
 

ompi/mpi/c/address.c

@@ -21,6 +21,17 @@
 #include "ompi_config.h"
 #include <stdio.h>
 
+/* This implementation has been removed from the MPI 3.1 standard.
+ * Open MPI v4.0.x is keeping the implementation in the library, but
+ * removing the prototypes from the headers, unless the user configures
+ * with --enable-mpi1-compatibility.
+ *
+ * To prevent having to port these implementations of removed functions
+ * to the newer MPI calls, we are defining ENABLE_MPI1_COMPAT to 1
+ * before including the c bindings.
+ */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/errhandler_create.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/communicator/communicator.h"
 #include "ompi/errhandler/errhandler.h"
@@ -31,7 +35,7 @@
 #define MPI_Errhandler_create PMPI_Errhandler_create
 #endif
 
-int MPI_Errhandler_create(MPI_Handler_function *function,
+int MPI_Errhandler_create(MPI_Comm_errhandler_function *function,
                           MPI_Errhandler *errhandler)
 {
 

ompi/mpi/c/errhandler_get.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/errhandler_set.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/profile/Makefile.am

@@ -416,7 +416,8 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
 	pwin_unlock_all.c \
         pwin_wait.c
 
-if OMPI_ENABLE_MPI1_COMPAT
+# include all of the removed MPI functions in library
+# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
 nodist_libmpi_c_pmpi_la_SOURCES += \
         paddress.c \
         perrhandler_create.c \
@@ -428,7 +429,6 @@ nodist_libmpi_c_pmpi_la_SOURCES += \
         ptype_lb.c \
         ptype_struct.c \
         ptype_ub.c
-endif
 
 #
 # Sym link in the sources from the real MPI directory

ompi/mpi/c/type_extent.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/type_hindexed.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/type_hvector.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"

ompi/mpi/c/type_lb.c

@@ -20,6 +20,10 @@
 
 #include "ompi_config.h"
 
+/* defining ENABLE_MPI1_COMPAT to 1 for removed implementations here.
+ * see comments in address.c for more information. */
+#define ENABLE_MPI1_COMPAT 1
+
 #include "ompi/mpi/c/bindings.h"
 #include "ompi/runtime/params.h"
 #include "ompi/communicator/communicator.h"