Skip to content

Commit 18ea9a1

Browse files
authored
Merge pull request #7431 from rhc54/topic/dep
Deprecate the --with-pmi option
2 parents c4e1b65 + 7ebaee7 commit 18ea9a1

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

config/ompi_deprecated_options.m4

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# -*- shell-script -*-
2+
#
3+
# Copyright (c) 2020 Intel, Inc. All rights reserved.
4+
# $COPYRIGHT$
5+
#
6+
# Additional copyrights may follow
7+
#
8+
# $HEADER$
9+
#
10+
11+
AC_DEFUN([OMPI_CHECK_DEPRECATED_OPTIONS],[
12+
OPAL_VAR_SCOPE_PUSH(with_pmi_given with_pmi_libdir_given)
13+
14+
AC_ARG_WITH([pmi],
15+
[AC_HELP_STRING([--with-pmi(=DIR)],
16+
[*DEPRECATED* Build PMI support, optionally adding DIR to the search path (default: no)])],
17+
[with_pmi_given=yes])
18+
19+
AC_ARG_WITH([pmi-libdir],
20+
[AC_HELP_STRING([--with-pmi-libdir=DIR],
21+
[*DEPRECATED* Look for libpmi or libpmi2 in the given directory DIR, DIR/lib or DIR/lib64])],
22+
[with_pmi_libdir_given=yes])
23+
24+
if test "$with_pmi_given" = "yes" || test "$with_pmi_libdir_given" = "yes"; then
25+
AC_MSG_WARN([Open MPI no longer supports PMI-1 or PMI-2 libraries.])
26+
AC_MSG_WARN([PMIx is now required. Either the internal version or an])
27+
AC_MSG_WARN([external version of PMIx may be used, so long as the])
28+
AC_MSG_WARN([external version is compatible with the PMIx v2.2])
29+
AC_MSG_WARN([Standard or higher. Note that cross-version support])
30+
AC_MSG_WARN([within the OpenPMIx library can be used by this OMPI])
31+
AC_MSG_WARN([to interact with environments based on other PMIx])
32+
AC_MSG_WARN([versions.])
33+
AC_MSG_ERROR([Build cannot continue.])
34+
fi
35+
36+
OPAL_VAR_SCOPE_POP
37+
])

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then
192192
AC_MSG_NOTICE([Detected VPATH build])
193193
fi
194194

195+
# Check for deprecated options
196+
OMPI_CHECK_DEPRECATED_OPTIONS
197+
195198
# Setup the top of the opal/include/opal_config.h file
196199

197200
AH_TOP([/* -*- c -*-

0 commit comments

Comments
 (0)