1
1

Deprecate the --with-pmi option

Per the developer's meeting, add detection of the deprecated --with-pmi
(and its associated --with-pmi-libdir) configure option and error out
with a polite note of the change in support

Since "--with-pmi" now shows in the configure help output, mark the help
string with a giant *DEPRECATED* to warn users not to use it

Signed-off-by: Ralph Castain <rhc@pmix.org>

Ma

Signed-off-by: Ralph Castain <rhc@pmix.org>
Этот коммит содержится в:
Ralph Castain 2020-02-19 10:07:50 -08:00
родитель 960c5f736f
Коммит 7ebaee7437
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B63B630167D26BB5
3 изменённых файлов: 41 добавлений и 1 удалений

37
config/ompi_deprecated_options.m4 Обычный файл
Просмотреть файл

@ -0,0 +1,37 @@
# -*- shell-script -*-
#
# Copyright (c) 2020 Intel, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
#
# $HEADER$
#
AC_DEFUN([OMPI_CHECK_DEPRECATED_OPTIONS],[
OPAL_VAR_SCOPE_PUSH(with_pmi_given with_pmi_libdir_given)
AC_ARG_WITH([pmi],
[AC_HELP_STRING([--with-pmi(=DIR)],
[*DEPRECATED* Build PMI support, optionally adding DIR to the search path (default: no)])],
[with_pmi_given=yes])
AC_ARG_WITH([pmi-libdir],
[AC_HELP_STRING([--with-pmi-libdir=DIR],
[*DEPRECATED* Look for libpmi or libpmi2 in the given directory DIR, DIR/lib or DIR/lib64])],
[with_pmi_libdir_given=yes])
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])
AC_MSG_WARN([external version of PMIx may be used, so long as the])
AC_MSG_WARN([external version is compatible with the PMIx v2.2])
AC_MSG_WARN([Standard or higher. Note that cross-version support])
AC_MSG_WARN([within the OpenPMIx library can be used by this OMPI])
AC_MSG_WARN([to interact with environments based on other PMIx])
AC_MSG_WARN([versions.])
AC_MSG_ERROR([Build cannot continue.])
fi
OPAL_VAR_SCOPE_POP
])

Просмотреть файл

@ -192,6 +192,9 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
AC_MSG_NOTICE([Detected VPATH build])
fi
# Check for deprecated options
OMPI_CHECK_DEPRECATED_OPTIONS
# Setup the top of the opal/include/opal_config.h file
AH_TOP([/* -*- c -*-

2
prrte

@ -1 +1 @@
Subproject commit fc30acbf0ff0d0557bac91ac7a8019d9723ff5c8
Subproject commit 39409adca53f4e58f07ad6a15c08717749ea606c