From a620328736a8734be3976e65df48f3025d25041a Mon Sep 17 00:00:00 2001 From: Geoffrey Paulsen Date: Tue, 22 Jan 2019 07:26:29 -0500 Subject: [PATCH] Remove MPI1 functionality completely This commit removes MPI1 functionality that was removed in the MPI 3.0 standard, completely. This commit also removes the ability to configure with --enable-mpi1-compatibility configure flag. Users of these removed interfaces should stay at Open MPI v4.x. This commit also removes all of the MPI data structures, and functions from mpi.h that were removed in the MPI3.0 standard. Including the Fortran TKR definitions. --- config/ompi_configure_options.m4 | 18 +- ompi/datatype/ompi_datatype_args.c | 28 +- ompi/include/mpi.h.in | 126 ------ ompi/mpi/c/Makefile.am | 15 - ompi/mpi/c/profile/Makefile.am | 15 +- ompi/mpi/cxx/mpicxx.cc | 6 - .../mpi/fortran/configure-fortran-output.h.in | 2 - ompi/mpi/fortran/mpif-h/Makefile.am | 17 +- ompi/mpi/fortran/mpif-h/profile/Makefile.am | 15 +- .../fortran/use-mpi-ignore-tkr/Makefile.am | 5 +- .../mpi-ignore-tkr-removed-interfaces.h.in | 358 ------------------ .../use-mpi-ignore-tkr/mpi-ignore-tkr.F90 | 7 - .../use-mpi-tkr/mpi-f90-removed-interfaces.h | 185 --------- ompi/mpi/fortran/use-mpi-tkr/mpi.F90 | 9 - .../use-mpi-tkr/pmpi-f90-removed-interfaces.h | 185 --------- 15 files changed, 16 insertions(+), 975 deletions(-) delete mode 100644 ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h.in delete mode 100644 ompi/mpi/fortran/use-mpi-tkr/mpi-f90-removed-interfaces.h delete mode 100644 ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-removed-interfaces.h diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4 index ddee9a32778..6609d9a82a6 100644 --- a/config/ompi_configure_options.m4 +++ b/config/ompi_configure_options.m4 @@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. -dnl Copyright (c) 2009 IBM Corporation. All rights reserved. +dnl Copyright (c) 2009-2019 IBM Corporation. All rights reserved. dnl Copyright (c) 2009-2018 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. @@ -196,22 +196,6 @@ fi AC_DEFINE_UNQUOTED([OMPI_WANT_MPI_CXX_SEEK], [$OMPI_WANT_MPI_CXX_SEEK], [do we want to try to work around C++ bindings SEEK_* issue?]) -# Remove these when we finally kill them once and for all -AC_ARG_ENABLE([mpi1-compatibility], - [AC_HELP_STRING([--enable-mpi1-compatibility], - [Enable support for MPI-1.x functions removed from the current MPI standard (MPI-3.x). This option will go away in a future release of Open MPI (default: disabled)])]) - -if test "x$enable_mpi1_compatibility" = "xyes" ; then -ompi_mpi1_support=1 -else -ompi_mpi1_support=0 -fi - - -AC_DEFINE_UNQUOTED([OMPI_ENABLE_MPI1_COMPAT], [$ompi_mpi1_support], [whether we want MPI-1.x support]) -AC_SUBST([OMPI_ENABLE_MPI1_COMPAT], [$ompi_mpi1_support]) -AM_CONDITIONAL([OMPI_ENABLE_MPI1_COMPAT],[test $ompi_mpi1_support = 1]) - AC_ARG_ENABLE([grequest-extensions], [AC_HELP_STRING([--enable-grequest-extensions], [Enable support for Grequest extensions (default: disabled)])]) diff --git a/ompi/datatype/ompi_datatype_args.c b/ompi/datatype/ompi_datatype_args.c index 2063839ef33..8ed3a6ac42a 100644 --- a/ompi/datatype/ompi_datatype_args.c +++ b/ompi/datatype/ompi_datatype_args.c @@ -841,25 +841,19 @@ ompi_datatype_t* ompi_datatype_get_single_predefined_type_from_args( ompi_dataty return NULL; } } -#if OMPI_ENABLE_MPI1_COMPAT - if (current_predef != MPI_LB && current_predef != MPI_UB) { -#endif - if( NULL == predef ) { /* This is the first iteration */ - predef = current_predef; - } else { - /** - * What exactly should we consider as identical types? - * If they are the same MPI level type, or if they map - * to the same OPAL datatype? In other words, MPI_FLOAT - * and MPI_REAL4 are they identical? - */ - if( predef != current_predef ) { - return NULL; - } + if( NULL == predef ) { /* This is the first iteration */ + predef = current_predef; + } else { + /** + * What exactly should we consider as identical types? + * If they are the same MPI level type, or if they map + * to the same OPAL datatype? In other words, MPI_FLOAT + * and MPI_REAL4 are they identical? + */ + if( predef != current_predef ) { + return NULL; } -#if OMPI_ENABLE_MPI1_COMPAT } -#endif } return predef; } diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in index 08beae1783b..76bbd66a87c 100644 --- a/ompi/include/mpi.h.in +++ b/ompi/include/mpi.h.in @@ -137,9 +137,6 @@ /* Whether we have FORTRAN REAL*8 or not */ #undef OMPI_HAVE_FORTRAN_REAL8 -/* Whether in include MPI-1 compatibility */ -#undef OMPI_ENABLE_MPI1_COMPAT - /* Whether we have float _Complex or not */ #undef HAVE_FLOAT__COMPLEX @@ -279,24 +276,6 @@ # else # define __mpi_interface_deprecated__(msg) __attribute__((__deprecated__)) # endif -# endif - /* For removed API, there is no portable way to cause the - * C compiler to error with a nice message on the usage of - * one of these symbols, so instead we use a C11 static_assert - * If the user is not using a C11 compiler, they will get an - * undefined reference, but no line number or nice message. - */ -# if (OMPI_ENABLE_MPI1_COMPAT && !OMPI_BUILDING) -# define OMPI_OMIT_MPI1_COMPAT_DECLS 0 -# if (__STDC_VERSION__ >= 201112L) -# define MPI_INTERFACE_REMOVED(func, newfunc, ...) _Static_assert(0, #func " was removed in MPI-3.0. Use " #newfunc " instead.") -# else -# if OPAL_HAVE_ATTRIBUTE_ERROR -# define MPI_INTERFACE_REMOVED(func, newfunc, ...) func(__VA_ARGS) __attribute__((__error__(#func " was removed in MPI-3.0. Use " #newfunc " instead."))) -# else -# define MPI_INTERFACE_REMOVED(func, newfunc, ...) func(__VA_ARGS) -# endif -# endif # endif # endif # endif @@ -311,14 +290,6 @@ # define __mpi_interface_deprecated__(msg) #endif -#if !defined(__mpi_interface_removed__) -# define __mpi_interface_removed__(msg) -#endif - -#if !defined(OMPI_OMIT_MPI1_COMPAT_DECLS) -# define OMPI_OMIT_MPI1_COMPAT_DECLS !OMPI_ENABLE_MPI1_COMPAT -#endif - /* * To accomodate programs written for MPI implementations that use a * straight ROMIO import @@ -1019,23 +990,6 @@ OMPI_DECLSPEC extern struct ompi_predefined_info_t ompi_mpi_info_env; OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUS_IGNORE; OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE; -#if (!OMPI_OMIT_MPI1_COMPAT_DECLS || OMPI_BUILDING) -/* - * Removed datatypes. These datatypes are only available if Open MPI - * was configured with --enable-mpi1-compatibility. - * - * These datatypes were formally removed from the MPI specification - * and should no longer be used in MPI applications. - */ -#define MPI_UB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_ub) -#define MPI_LB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_lb) - -OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_lb - __mpi_interface_removed__("MPI_LB was removed in MPI-3.0; use MPI_Type_create_resized instead."); -OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_ub - __mpi_interface_removed__("MPI_UB was removed in MPI-3.0; use MPI_Type_create_resized instead."); -#endif /* !OMPI_OMIT_MPI1_COMPAT_DECLS */ - /* * MPI predefined handles */ @@ -2686,86 +2640,6 @@ OMPI_DECLSPEC int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval, void* extra_state ) __mpi_interface_deprecated__("MPI_NULL_DELETE_FN was deprecated in MPI-2.0; use MPI_COMM_NULL_DELETE_FN instead."); -#if (!OMPI_OMIT_MPI1_COMPAT_DECLS || OMPI_BUILDING) -/* - * Removed typedefs. These typedefs are only available if Open MPI - * was configured with --enable-mpi1-compatibility. - * - * These typedefs were formally removed from the MPI specification - * and should no longer be used in MPI applications. - * - * Even though MPI_Handler_function is removed, we do not use the - * attributes marking it as such, because otherwise the compiler - * will warn for all the functions that are declared using them - * (e.g., MPI_Errhandler_create). - */ -typedef void (MPI_Handler_function)(MPI_Comm *, int *, ...); -/* MPI_Handler_function was removed in MPI-3.0; use MPI_Comm_use_errhandler_function instead. */ - -/* - * Removed prototypes. These prototypes are only available if Open - * MPI was configured with --enable-mpi1-compatibility. - * - * These functions were formally removed from the MPI specification - * and should no longer be used in MPI applications. - */ -OMPI_DECLSPEC int MPI_Address(void *location, MPI_Aint *address); -#define MPI_Address(...) MPI_INTERFACE_REMOVED(MPI_Address, MPI_Get_address) -OMPI_DECLSPEC int PMPI_Address(void *location, MPI_Aint *address); -#define PMPI_Address(...) MPI_INTERFACE_REMOVED(PMPI_Address, PMPI_Get_address) -OMPI_DECLSPEC int MPI_Errhandler_create(MPI_Handler_function *function, - MPI_Errhandler *errhandler); -#define MPI_Errhandler_create MPI_INTERFACE_REMOVED(MPI_Errhandler_create, MPI_Comm_create_errhandler) -OMPI_DECLSPEC int PMPI_Errhandler_create(MPI_Handler_function *function, - MPI_Errhandler *errhandler); -#define PMPI_Errhandler_create MPI_INTERFACE_REMOVED(PMPI_Errhandler_create, PMPI_Comm_create_errhandler) -OMPI_DECLSPEC int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler); -#define MPI_Errhandler_get(...) MPI_INTERFACE_REMOVED(MPI_Errhandler_get, MPI_Comm_get_errhandler) -OMPI_DECLSPEC int PMPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler); -#define PMPI_Errhandler_get(...) MPI_INTERFACE_REMOVED(PMPI_Errhandler_get, PMPI_Comm_get_errhandler) -OMPI_DECLSPEC int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler); -#define MPI_Errhandler_set(...) MPI_INTERFACE_REMOVED(MPI_Errhandler_set, MPI_Comm_set_errhandler) -OMPI_DECLSPEC int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler); -#define PMPI_Errhandler_set(...) MPI_INTERFACE_REMOVED(PMPI_Errhandler_set, PMPI_Comm_set_errhandler) -OMPI_DECLSPEC int MPI_Type_extent(MPI_Datatype type, MPI_Aint *extent); -#define MPI_Type_extent(...) MPI_INTERFACE_REMOVED(MPI_Type_extent, MPI_Type_get_extent) -OMPI_DECLSPEC int PMPI_Type_extent(MPI_Datatype type, MPI_Aint *extent); -#define PMPI_Type_extent(...) MPI_INTERFACE_REMOVED(PMPI_Type_extent, PMPI_Type_get_extent) -OMPI_DECLSPEC int MPI_Type_hindexed(int count, int array_of_blocklengths[], - MPI_Aint array_of_displacements[], - MPI_Datatype oldtype, MPI_Datatype *newtype); -#define MPI_Type_hindexed(...) MPI_INTERFACE_REMOVED(MPI_Type_hindexed, MPI_Type_create_hindexed) -OMPI_DECLSPEC int PMPI_Type_hindexed(int count, int array_of_blocklengths[], - MPI_Aint array_of_displacements[], - MPI_Datatype oldtype, MPI_Datatype *newtype); -#define PMPI_Type_hindexed(...) MPI_INTERFACE_REMOVED(PMPI_Type_hindexed, PMPI_Type_create_hindexed) -OMPI_DECLSPEC int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride, - MPI_Datatype oldtype, MPI_Datatype *newtype); -#define MPI_Type_hvector(...) MPI_INTERFACE_REMOVED(MPI_Type_hvector, MPI_Type_create_hvector) -OMPI_DECLSPEC int PMPI_Type_hvector(int count, int blocklength, MPI_Aint stride, - MPI_Datatype oldtype, MPI_Datatype *newtype); -#define PMPI_Type_hvector(...) MPI_INTERFACE_REMOVED(PMPI_Type_hvector, PMPI_Type_create_hvector) -OMPI_DECLSPEC int MPI_Type_lb(MPI_Datatype type, MPI_Aint *lb); -#define MPI_Type_lb(...) MPI_INTERFACE_REMOVED(MPI_Type_lb, MPI_Type_get_extent) -OMPI_DECLSPEC int PMPI_Type_lb(MPI_Datatype type, MPI_Aint *lb); -#define PMPI_Type_lb(...) MPI_INTERFACE_REMOVED(PMPI_Type_lb, PMPI_Type_get_extent) -OMPI_DECLSPEC int MPI_Type_struct(int count, int array_of_blocklengths[], - MPI_Aint array_of_displacements[], - MPI_Datatype array_of_types[], - MPI_Datatype *newtype); -#define MPI_Type_struct MPI_INTERFACE_REMOVED(MPI_Type_struct, MPI_Type_create_struct) -OMPI_DECLSPEC int PMPI_Type_struct(int count, int array_of_blocklengths[], - MPI_Aint array_of_displacements[], - MPI_Datatype array_of_types[], - MPI_Datatype *newtype); -#define PMPI_Type_struct MPI_INTERFACE_REMOVED(PMPI_Type_struct, PMPI_Type_create_struct) -OMPI_DECLSPEC int MPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub); -#define MPI_Type_ub(...) MPI_INTERFACE_REMOVED(MPI_Type_ub, MPI_Type_get_extent) -OMPI_DECLSPEC int PMPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub); -#define PMPI_Type_ub(...) MPI_INTERFACE_REMOVED(PMPI_Type_ub, PMPI_Type_get_extent) -#endif /* !OMPI_OMIT_MPI1_COMPAT_DECLS */ - - #if defined(c_plusplus) || defined(__cplusplus) } #endif diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index d4c822beba2..0f752bc79a7 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -436,21 +436,6 @@ libmpi_c_mpi_la_SOURCES = \ win_unlock_all.c \ win_wait.c - -if OMPI_ENABLE_MPI1_COMPAT -libmpi_c_mpi_la_SOURCES += \ - address.c \ - errhandler_create.c \ - errhandler_get.c \ - errhandler_set.c \ - type_extent.c \ - type_hindexed.c \ - type_hvector.c \ - type_lb.c \ - type_struct.c \ - type_ub.c -endif - # Conditionally install the header files if WANT_INSTALL_HEADERS diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am index 5330752db5c..fdbb350149e 100644 --- a/ompi/mpi/c/profile/Makefile.am +++ b/ompi/mpi/c/profile/Makefile.am @@ -18,6 +18,7 @@ # reserved. # Copyright (c) 2015-2018 Research Organization for Information Science # and Technology (RIST). All rights reserved. +# Copyright (c) 2019 IBM Corporation. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -416,20 +417,6 @@ nodist_libmpi_c_pmpi_la_SOURCES = \ pwin_unlock_all.c \ pwin_wait.c -if OMPI_ENABLE_MPI1_COMPAT -nodist_libmpi_c_pmpi_la_SOURCES += \ - paddress.c \ - perrhandler_create.c \ - perrhandler_get.c \ - perrhandler_set.c \ - ptype_extent.c \ - ptype_hindexed.c \ - ptype_hvector.c \ - ptype_lb.c \ - ptype_struct.c \ - ptype_ub.c -endif - # # Sym link in the sources from the real MPI directory # diff --git a/ompi/mpi/cxx/mpicxx.cc b/ompi/mpi/cxx/mpicxx.cc index 103cfc24b46..8788b9aa2c0 100644 --- a/ompi/mpi/cxx/mpicxx.cc +++ b/ompi/mpi/cxx/mpicxx.cc @@ -163,10 +163,4 @@ const char*** ARGVS_NULL = (const char***) MPI_ARGVS_NULL; // empty group const Group GROUP_EMPTY(MPI_GROUP_EMPTY); -#if OMPI_ENABLE_MPI1_COMPAT -// special datatypes for contstruction of derived datatypes -const Datatype UB(MPI_UB); -const Datatype LB(MPI_LB); -#endif - } /* namespace MPI */ diff --git a/ompi/mpi/fortran/configure-fortran-output.h.in b/ompi/mpi/fortran/configure-fortran-output.h.in index 6f1b82588ad..7678966b530 100644 --- a/ompi/mpi/fortran/configure-fortran-output.h.in +++ b/ompi/mpi/fortran/configure-fortran-output.h.in @@ -106,8 +106,6 @@ #define OMPI_KIND_FORTRAN_COMPLEX32 @OMPI_KIND_FORTRAN_COMPLEX32@ #define OMPI_SIZEOF_FORTRAN_COMPLEX32 @OMPI_SIZEOF_FORTRAN_COMPLEX32@ -#define OMPI_ENABLE_MPI1_COMPAT @OMPI_ENABLE_MPI1_COMPAT@ - ! Include some post-processing, based on the values from above #include "ompi/mpi/fortran/configure-fortran-output-bottom.h" diff --git a/ompi/mpi/fortran/mpif-h/Makefile.am b/ompi/mpi/fortran/mpif-h/Makefile.am index 1b1f80d8527..a547a5996d7 100644 --- a/ompi/mpi/fortran/mpif-h/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/Makefile.am @@ -16,7 +16,7 @@ # reserved. # Copyright (c) 2015-2017 Research Organization for Information Science # and Technology (RIST). All rights reserved. -# Copyright (c) 2016 IBM Corporation. All rights reserved. +# Copyright (c) 2016-2019 IBM Corporation. All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ # @@ -483,21 +483,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \ win_flush_all_f.c \ win_flush_local_f.c \ win_flush_local_all_f.c - - -if OMPI_ENABLE_MPI1_COMPAT -lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \ - address_f.c \ - errhandler_create_f.c \ - errhandler_get_f.c \ - errhandler_set_f.c \ - type_extent_f.c \ - type_hindexed_f.c \ - type_hvector_f.c \ - type_lb_f.c \ - type_struct_f.c \ - type_ub_f.c -endif endif # diff --git a/ompi/mpi/fortran/mpif-h/profile/Makefile.am b/ompi/mpi/fortran/mpif-h/profile/Makefile.am index 35a9390f6fb..28557e9a6f1 100644 --- a/ompi/mpi/fortran/mpif-h/profile/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/profile/Makefile.am @@ -18,6 +18,7 @@ # Copyright (c) 2015-2018 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. +# Copyright (c) 2019 IBM Corporation. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -398,20 +399,6 @@ linked_files = \ pwin_flush_local_f.c \ pwin_flush_local_all_f.c -if OMPI_ENABLE_MPI1_COMPAT -linked_files += \ - paddress_f.c \ - perrhandler_create_f.c \ - perrhandler_get_f.c \ - perrhandler_set_f.c \ - ptype_extent_f.c \ - ptype_hindexed_f.c \ - ptype_hvector_f.c \ - ptype_lb_f.c \ - ptype_struct_f.c \ - ptype_ub_f.c -endif - # # Sym link in the sources from the real MPI directory # diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am b/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am index 0c131e4f918..35bdbf40e4c 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am @@ -28,13 +28,11 @@ lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr.la mpi-ignore-tkr-interfaces.h: mpi-ignore-tkr-interfaces.h.in mpi-ignore-tkr-file-interfaces.h: mpi-ignore-tkr-file-interfaces.h.in -mpi-ignore-tkr-removed-interfaces.h: mpi-ignore-tkr-removed-interfaces.h.in mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/attr-fn-int-callback-interfaces.h mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/conversion-fn-null-int-interface.h mpi-ignore-tkr.lo: mpi-ignore-tkr-interfaces.h mpi-ignore-tkr.lo: mpi-ignore-tkr-file-interfaces.h -mpi-ignore-tkr.lo: mpi-ignore-tkr-removed-interfaces.h mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.h mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.f90 mpi-ignore-tkr.lo: mpi-ignore-tkr.F90 @@ -43,8 +41,7 @@ lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \ mpi-ignore-tkr.F90 nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \ mpi-ignore-tkr-interfaces.h \ - mpi-ignore-tkr-file-interfaces.h \ - mpi-ignore-tkr-removed-interfaces.h + mpi-ignore-tkr-file-interfaces.h if BUILD_FORTRAN_SIZEOF # These files are generated; do not distribute them diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h.in b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h.in deleted file mode 100644 index 4a00caf5de0..00000000000 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h.in +++ /dev/null @@ -1,358 +0,0 @@ -! -*- fortran -*- -! -! Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. -! Copyright (c) 2007 Los Alamos National Security, LLC. All rights -! reserved. -! Copyright (c) 2012 The University of Tennessee and The University -! of Tennessee Research Foundation. All rights -! reserved. -! Copyright (c) 2012 Inria. All rights reserved. -! Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights -! reserved. -! Copyright (c) 2015 Research Organization for Information Science -! and Technology (RIST). All rights reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ - -interface MPI_Address - -subroutine MPI_Address(location, address, ierror) - @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ location - @OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: location - integer, intent(out) :: address - integer, intent(out) :: ierror -end subroutine MPI_Address - -end interface - -interface PMPI_Address - -subroutine PMPI_Address(location, address, ierror) - @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ location - @OMPI_FORTRAN_IGNORE_TKR_TYPE@, intent(in) :: location - integer, intent(out) :: address - integer, intent(out) :: ierror -end subroutine PMPI_Address - -end interface - -interface MPI_Attr_delete - -subroutine MPI_Attr_delete(comm, keyval, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: ierror -end subroutine MPI_Attr_delete - -end interface - -interface PMPI_Attr_delete - -subroutine PMPI_Attr_delete(comm, keyval, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: ierror -end subroutine PMPI_Attr_delete - -end interface - - -interface MPI_Attr_get - -subroutine MPI_Attr_get(comm, keyval, attribute_val, flag, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: attribute_val - logical, intent(out) :: flag - integer, intent(out) :: ierror -end subroutine MPI_Attr_get - -end interface - -interface PMPI_Attr_get - -subroutine PMPI_Attr_get(comm, keyval, attribute_val, flag, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: attribute_val - logical, intent(out) :: flag - integer, intent(out) :: ierror -end subroutine PMPI_Attr_get - -end interface - - -interface MPI_Attr_put - -subroutine MPI_Attr_put(comm, keyval, attribute_val, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(in) :: attribute_val - integer, intent(out) :: ierror -end subroutine MPI_Attr_put - -end interface - -interface PMPI_Attr_put - -subroutine PMPI_Attr_put(comm, keyval, attribute_val, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(in) :: attribute_val - integer, intent(out) :: ierror -end subroutine PMPI_Attr_put - -end interface - -interface MPI_Errhandler_create - -subroutine MPI_Errhandler_create(function, errhandler, ierror) - external :: function - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_create - -end interface - -interface PMPI_Errhandler_create - -subroutine PMPI_Errhandler_create(function, errhandler, ierror) - external :: function - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_create - -end interface - -interface MPI_Errhandler_get - -subroutine MPI_Errhandler_get(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_get - -end interface - -interface PMPI_Errhandler_get - -subroutine PMPI_Errhandler_get(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_get - -end interface - - -interface MPI_Errhandler_set - -subroutine MPI_Errhandler_set(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(in) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_set - -end interface - -interface PMPI_Errhandler_set - -subroutine PMPI_Errhandler_set(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(in) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_set - -end interface - -interface MPI_Keyval_create - -subroutine MPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state, ierror) - external :: copy_fn - external :: delete_fn - integer, intent(out) :: keyval - integer, intent(in) :: extra_state - integer, intent(out) :: ierror -end subroutine MPI_Keyval_create - -end interface - -interface PMPI_Keyval_create - -subroutine PMPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state, ierror) - external :: copy_fn - external :: delete_fn - integer, intent(out) :: keyval - integer, intent(in) :: extra_state - integer, intent(out) :: ierror -end subroutine PMPI_Keyval_create - -end interface - - -interface MPI_Keyval_free - -subroutine MPI_Keyval_free(keyval, ierror) - integer, intent(inout) :: keyval - integer, intent(out) :: ierror -end subroutine MPI_Keyval_free - -end interface - -interface PMPI_Keyval_free - -subroutine PMPI_Keyval_free(keyval, ierror) - integer, intent(inout) :: keyval - integer, intent(out) :: ierror -end subroutine PMPI_Keyval_free - -end interface - -interface MPI_Type_extent - -subroutine MPI_Type_extent(datatype, extent, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: extent - integer, intent(out) :: ierror -end subroutine MPI_Type_extent - -end interface - -interface PMPI_Type_extent - -subroutine PMPI_Type_extent(datatype, extent, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: extent - integer, intent(out) :: ierror -end subroutine PMPI_Type_extent - -end interface - -interface MPI_Type_hindexed - -subroutine MPI_Type_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_hindexed - -end interface - -interface PMPI_Type_hindexed - -subroutine PMPI_Type_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_hindexed - -end interface - - -interface MPI_Type_hvector - -subroutine MPI_Type_hvector(count, blocklength, stride, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, intent(in) :: blocklength - integer, intent(in) :: stride - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_hvector - -end interface - -interface PMPI_Type_hvector - -subroutine PMPI_Type_hvector(count, blocklength, stride, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, intent(in) :: blocklength - integer, intent(in) :: stride - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_hvector - -end interface - -interface MPI_Type_lb - -subroutine MPI_Type_lb(datatype, lb, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: lb - integer, intent(out) :: ierror -end subroutine MPI_Type_lb - -end interface - -interface PMPI_Type_lb - -subroutine PMPI_Type_lb(datatype, lb, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: lb - integer, intent(out) :: ierror -end subroutine PMPI_Type_lb - -end interface - -interface MPI_Type_struct - -subroutine MPI_Type_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, dimension(*), intent(in) :: array_of_types - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_struct - -end interface - -interface PMPI_Type_struct - -subroutine PMPI_Type_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, dimension(*), intent(in) :: array_of_types - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_struct - -end interface - - -interface MPI_Type_ub - -subroutine MPI_Type_ub(datatype, ub, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: ub - integer, intent(out) :: ierror -end subroutine MPI_Type_ub - -end interface - -interface PMPI_Type_ub - -subroutine PMPI_Type_ub(datatype, ub, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: ub - integer, intent(out) :: ierror -end subroutine PMPI_Type_ub - -end interface diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 index e19c4280a93..c3acea62cad 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 @@ -43,13 +43,6 @@ module mpi include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h" include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h" -#if !defined(OMPI_ENABLE_MPI1_COMPAT) - -#error "Remove MPI-1 compat code" - -#elif OMPI_ENABLE_MPI1_COMPAT - include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-removed-interfaces.h" -#endif include 'mpi-ignore-tkr-sizeof.h' diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-removed-interfaces.h b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-removed-interfaces.h deleted file mode 100644 index 48ede9d15e8..00000000000 --- a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-removed-interfaces.h +++ /dev/null @@ -1,185 +0,0 @@ -! -*- fortran -*- -! -! Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana -! University Research and Technology -! Corporation. All rights reserved. -! Copyright (c) 2004-2005 The University of Tennessee and The University -! of Tennessee Research Foundation. All rights -! reserved. -! Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -! University of Stuttgart. All rights reserved. -! Copyright (c) 2004-2005 The Regents of the University of California. -! All rights reserved. -! Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved. -! Copyright (c) 2016 Research Organization for Information Science -! and Technology (RIST). All rights reserved. -! Copyright (c) 2018 Los Alamos National Security, LLC. All rights -! reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! - -interface MPI_Attr_delete - -subroutine MPI_Attr_delete(comm, keyval, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: ierror -end subroutine MPI_Attr_delete - -end interface - - -interface MPI_Attr_get - -subroutine MPI_Attr_get(comm, keyval, attribute_val, flag, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: attribute_val - logical, intent(out) :: flag - integer, intent(out) :: ierror -end subroutine MPI_Attr_get - -end interface - - -interface MPI_Attr_put - -subroutine MPI_Attr_put(comm, keyval, attribute_val, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(in) :: attribute_val - integer, intent(out) :: ierror -end subroutine MPI_Attr_put - -end interface - -interface MPI_Errhandler_create - -subroutine MPI_Errhandler_create(function, errhandler, ierror) - external :: function - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_create - -end interface - -interface MPI_Errhandler_get - -subroutine MPI_Errhandler_get(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_get - -end interface - - -interface MPI_Errhandler_set - -subroutine MPI_Errhandler_set(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(in) :: errhandler - integer, intent(out) :: ierror -end subroutine MPI_Errhandler_set - -end interface - -interface MPI_Keyval_create - -subroutine MPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state, ierror) - external :: copy_fn - external :: delete_fn - integer, intent(out) :: keyval - integer, intent(in) :: extra_state - integer, intent(out) :: ierror -end subroutine MPI_Keyval_create - -end interface - - -interface MPI_Keyval_free - -subroutine MPI_Keyval_free(keyval, ierror) - integer, intent(inout) :: keyval - integer, intent(out) :: ierror -end subroutine MPI_Keyval_free - -end interface - -interface MPI_Type_extent - -subroutine MPI_Type_extent(datatype, extent, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: extent - integer, intent(out) :: ierror -end subroutine MPI_Type_extent - -end interface - -interface MPI_Type_hindexed - -subroutine MPI_Type_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_hindexed - -end interface - - -interface MPI_Type_hvector - -subroutine MPI_Type_hvector(count, blocklength, stride, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, intent(in) :: blocklength - integer, intent(in) :: stride - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_hvector - -end interface - -interface MPI_Type_lb - -subroutine MPI_Type_lb(datatype, lb, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: lb - integer, intent(out) :: ierror -end subroutine MPI_Type_lb - -end interface - -interface MPI_Type_struct - -subroutine MPI_Type_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, dimension(*), intent(in) :: array_of_types - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine MPI_Type_struct - -end interface - - -interface MPI_Type_ub - -subroutine MPI_Type_ub(datatype, ub, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: ub - integer, intent(out) :: ierror -end subroutine MPI_Type_ub - -end interface diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 b/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 index 7073ffbb4e9..9ac593a8d70 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 +++ b/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 @@ -60,13 +60,4 @@ module mpi include "mpi-tkr-sizeof.h" #endif -#if !defined(OMPI_ENABLE_MPI1_COMPAT) - -#error "Remove MPI-1 compat code" - -#elif OMPI_ENABLE_MPI1_COMPAT - include "mpi-f90-removed-interfaces.h" - include "pmpi-f90-removed-interfaces.h" -#endif - end module mpi diff --git a/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-removed-interfaces.h b/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-removed-interfaces.h deleted file mode 100644 index ae7a65b390e..00000000000 --- a/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-removed-interfaces.h +++ /dev/null @@ -1,185 +0,0 @@ -! -*- fortran -*- -! -! Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana -! University Research and Technology -! Corporation. All rights reserved. -! Copyright (c) 2004-2005 The University of Tennessee and The University -! of Tennessee Research Foundation. All rights -! reserved. -! Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -! University of Stuttgart. All rights reserved. -! Copyright (c) 2004-2005 The Regents of the University of California. -! All rights reserved. -! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. -! Copyright (c) 2016 Research Organization for Information Science -! and Technology (RIST). All rights reserved. -! Copyright (c) 2018 Los Alamos National Security, LLC. All rights -! reserved. -! $COPYRIGHT$ -! -! Additional copyrights may follow -! -! $HEADER$ -! - -interface PMPI_Attr_delete - -subroutine PMPI_Attr_delete(comm, keyval, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: ierror -end subroutine PMPI_Attr_delete - -end interface - - -interface PMPI_Attr_get - -subroutine PMPI_Attr_get(comm, keyval, attribute_val, flag, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(out) :: attribute_val - logical, intent(out) :: flag - integer, intent(out) :: ierror -end subroutine PMPI_Attr_get - -end interface - - -interface PMPI_Attr_put - -subroutine PMPI_Attr_put(comm, keyval, attribute_val, ierror) - integer, intent(in) :: comm - integer, intent(in) :: keyval - integer, intent(in) :: attribute_val - integer, intent(out) :: ierror -end subroutine PMPI_Attr_put - -end interface - -interface PMPI_Errhandler_create - -subroutine PMPI_Errhandler_create(function, errhandler, ierror) - external :: function - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_create - -end interface - -interface PMPI_Errhandler_get - -subroutine PMPI_Errhandler_get(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(out) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_get - -end interface - - -interface PMPI_Errhandler_set - -subroutine PMPI_Errhandler_set(comm, errhandler, ierror) - integer, intent(in) :: comm - integer, intent(in) :: errhandler - integer, intent(out) :: ierror -end subroutine PMPI_Errhandler_set - -end interface - -interface PMPI_Keyval_create - -subroutine PMPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state, ierror) - external :: copy_fn - external :: delete_fn - integer, intent(out) :: keyval - integer, intent(in) :: extra_state - integer, intent(out) :: ierror -end subroutine PMPI_Keyval_create - -end interface - - -interface PMPI_Keyval_free - -subroutine PMPI_Keyval_free(keyval, ierror) - integer, intent(inout) :: keyval - integer, intent(out) :: ierror -end subroutine PMPI_Keyval_free - -end interface - -interface PMPI_Type_extent - -subroutine PMPI_Type_extent(datatype, extent, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: extent - integer, intent(out) :: ierror -end subroutine PMPI_Type_extent - -end interface - -interface PMPI_Type_hindexed - -subroutine PMPI_Type_hindexed(count, array_of_blocklengths, array_of_displacements, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_hindexed - -end interface - - -interface PMPI_Type_hvector - -subroutine PMPI_Type_hvector(count, blocklength, stride, oldtype, newtype& - , ierror) - integer, intent(in) :: count - integer, intent(in) :: blocklength - integer, intent(in) :: stride - integer, intent(in) :: oldtype - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_hvector - -end interface - -interface PMPI_Type_lb - -subroutine PMPI_Type_lb(datatype, lb, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: lb - integer, intent(out) :: ierror -end subroutine PMPI_Type_lb - -end interface - -interface PMPI_Type_struct - -subroutine PMPI_Type_struct(count, array_of_blocklengths, array_of_displacements, array_of_types, newtype& - , ierror) - integer, intent(in) :: count - integer, dimension(*), intent(in) :: array_of_blocklengths - integer, dimension(*), intent(in) :: array_of_displacements - integer, dimension(*), intent(in) :: array_of_types - integer, intent(out) :: newtype - integer, intent(out) :: ierror -end subroutine PMPI_Type_struct - -end interface - - -interface PMPI_Type_ub - -subroutine PMPI_Type_ub(datatype, ub, ierror) - integer, intent(in) :: datatype - integer, intent(out) :: ub - integer, intent(out) :: ierror -end subroutine PMPI_Type_ub - -end interface