Skip to content

Commit b3f00bc

Browse files
committed
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?) 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]>
1 parent f7d0a7d commit b3f00bc

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

ompi/mpi/c/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,8 @@ libmpi_c_mpi_la_SOURCES = \
437437
win_wait.c
438438

439439

440-
if OMPI_ENABLE_MPI1_COMPAT
440+
# include all of the removed MPI functions in library
441+
# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
441442
libmpi_c_mpi_la_SOURCES += \
442443
address.c \
443444
errhandler_create.c \
@@ -449,7 +450,6 @@ libmpi_c_mpi_la_SOURCES += \
449450
type_lb.c \
450451
type_struct.c \
451452
type_ub.c
452-
endif
453453

454454
# Conditionally install the header files
455455

ompi/mpi/c/errhandler_create.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define MPI_Errhandler_create PMPI_Errhandler_create
3232
#endif
3333

34-
int MPI_Errhandler_create(MPI_Handler_function *function,
34+
int MPI_Errhandler_create(MPI_Comm_errhandler_function *function,
3535
MPI_Errhandler *errhandler)
3636
{
3737

ompi/mpi/c/profile/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ nodist_libmpi_c_pmpi_la_SOURCES = \
416416
pwin_unlock_all.c \
417417
pwin_wait.c
418418

419-
if OMPI_ENABLE_MPI1_COMPAT
419+
# include all of the removed MPI functions in library
420+
# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
420421
nodist_libmpi_c_pmpi_la_SOURCES += \
421422
paddress.c \
422423
perrhandler_create.c \
@@ -428,7 +429,6 @@ nodist_libmpi_c_pmpi_la_SOURCES += \
428429
ptype_lb.c \
429430
ptype_struct.c \
430431
ptype_ub.c
431-
endif
432432

433433
#
434434
# Sym link in the sources from the real MPI directory

ompi/mpi/fortran/mpif-h/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
481481
win_flush_local_f.c \
482482
win_flush_local_all_f.c
483483

484-
485-
if OMPI_ENABLE_MPI1_COMPAT
484+
# include all of the removed MPI functions in library
485+
# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
486486
lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
487487
address_f.c \
488488
errhandler_create_f.c \
@@ -495,7 +495,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
495495
type_struct_f.c \
496496
type_ub_f.c
497497
endif
498-
endif
499498

500499
#
501500
# Conditionally install the header files

ompi/mpi/fortran/mpif-h/profile/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,8 @@ linked_files = \
397397
pwin_flush_local_f.c \
398398
pwin_flush_local_all_f.c
399399

400-
if OMPI_ENABLE_MPI1_COMPAT
400+
# include all of the removed MPI functions in library
401+
# for v4.0.x regardless of state of OMPI_ENABLE_MPI1_COMPAT
401402
linked_files += \
402403
paddress_f.c \
403404
perrhandler_create_f.c \
@@ -409,7 +410,6 @@ linked_files += \
409410
ptype_lb_f.c \
410411
ptype_struct_f.c \
411412
ptype_ub_f.c
412-
endif
413413

414414
#
415415
# Sym link in the sources from the real MPI directory

0 commit comments

Comments
 (0)