From 9b05b1c4a7cd23a517108496c28f8908ebbfdb31 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 29 Feb 2020 10:57:45 -0800 Subject: [PATCH 1/3] Tweak the C++ binding deprecation check Some of us have platform files that expressly disabled C++ support. While it is true that v5 no longer supports C++ and thus no longer needs us to disable it, there seems no reason to make us create platform files that differentiate based on OMPI version just for that reason. So if someone asks to "disable" the no-longer-existing support, just ignore it. Signed-off-by: Ralph Castain --- config/ompi_deleted_options.m4 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/config/ompi_deleted_options.m4 b/config/ompi_deleted_options.m4 index 42ccb8a178..cecb6f1a63 100644 --- a/config/ompi_deleted_options.m4 +++ b/config/ompi_deleted_options.m4 @@ -37,6 +37,8 @@ AC_DEFUN([OMPI_CHECK_DELETED_OPTIONS],[ # Open MPI C++ bindings were removed in v5.0 cxx=0 + cxxseek=0 + cxxex=0 AC_ARG_ENABLE([mpi-cxx], [AC_HELP_STRING([--enable-mpi-cxx], [*DELETED* Build the MPI C++ bindings])], @@ -44,13 +46,22 @@ AC_DEFUN([OMPI_CHECK_DELETED_OPTIONS],[ AC_ARG_ENABLE([mpi-cxx-seek], [AC_HELP_STRING([--enable-mpi-cxx-seek], [*DELETED* Build support for MPI::SEEK])], - [cxx=1]) + [cxxseek=1]) AC_ARG_ENABLE([cxx-exceptions], [AC_HELP_STRING([--enable-cxx-exceptions], [*DELETED* Build support for C++ exceptions in the MPI C++ bindings])], - [cxx=1]) + [cxxex=1]) - AS_IF([test $cxx -eq 1], + AS_IF([test "$enable_mpi_cxx" = "no" ], + [cxx=0]) + + AS_IF([test "$enable_mpi_cxx_seek" = "no" ], + [cxxseek=0]) + + AS_IF([test "$enable_cxx_exceptions" = "no" ], + [cxxex=0]) + + AS_IF([test $cxx -eq 1 || test $cxxseek -eq 1 || test $cxxex -eq 1], [AC_MSG_WARN([The MPI C++ bindings have been removed from Open MPI.]) AC_MSG_WARN([If you need support for the MPI C++ bindings, you]) AC_MSG_WARN([will need to use an older version of Open MPI.]) From 458b1563e23d838423e0adebf419c4bc3fc755d8 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 29 Feb 2020 11:44:11 -0800 Subject: [PATCH 2/3] Treat PMI-1/2 options the same For consistency, allow the --without-pmi option Signed-off-by: Ralph Castain --- config/ompi_deleted_options.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/ompi_deleted_options.m4 b/config/ompi_deleted_options.m4 index cecb6f1a63..2c67e6c8da 100644 --- a/config/ompi_deleted_options.m4 +++ b/config/ompi_deleted_options.m4 @@ -23,6 +23,12 @@ AC_DEFUN([OMPI_CHECK_DELETED_OPTIONS],[ [*DELETED* Look for libpmi or libpmi2 in the given directory DIR, DIR/lib or DIR/lib64])], [with_pmi_libdir_given=yes]) + AS_IF([test "$with_pmi" = "no"], + [with_pmi_given=no]) + + AS_IF([test "$with_pmi_libdir" = "no"], + [with_pmi_libdir_given=no]) + if test "$with_pmi_given" = "yes" || test "$with_pmi_libdir_given" = "yes"; then AC_MSG_WARN([Open MPI no longer supports PMI-1 or PMI-2 libraries.]) AC_MSG_WARN([PMIx is now required. Either the internal version or an]) From 4fe9ae329c767b3856867a07aaa16a0b18dcfefa Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 29 Feb 2020 11:54:38 -0800 Subject: [PATCH 3/3] Add missing include and remove stale PML The "yalla" pml no longer exists Signed-off-by: Ralph Castain --- ompi/mca/pml/base/pml_base_frame.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ompi/mca/pml/base/pml_base_frame.c b/ompi/mca/pml/base/pml_base_frame.c index 85583a880a..789fb9b03f 100644 --- a/ompi/mca/pml/base/pml_base_frame.c +++ b/ompi/mca/pml/base/pml_base_frame.c @@ -16,6 +16,7 @@ * Copyright (c) 2015 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018 IBM Corporation. All rights reserved. + * Copyright (c) 2020 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -32,6 +33,7 @@ #include #endif /* HAVE_UNIST_H */ #include "ompi/mca/mca.h" +#include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/mca/base/base.h" @@ -214,7 +216,6 @@ static int mca_pml_base_open(mca_base_open_flag_t flags) if( (NULL == default_pml || NULL == default_pml[0] || 0 == strlen(default_pml[0])) || (default_pml[0][0] == '^') ) { opal_pointer_array_add(&mca_pml_base_pml, strdup("ob1")); - opal_pointer_array_add(&mca_pml_base_pml, strdup("yalla")); opal_pointer_array_add(&mca_pml_base_pml, strdup("ucx")); opal_pointer_array_add(&mca_pml_base_pml, strdup("cm")); } else {