From 3bfc7a7b620d38cdf8b39e4a9a04e357347a344d Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 20 Feb 2020 12:08:11 -0800 Subject: [PATCH 1/2] Tweak: rename "deprecated" --> "deleted" We're dealing with CLI options that have been deleted, not deprecated. Signed-off-by: Jeff Squyres (cherry picked from commit 5aea4446288db9207fbc60f23ee903b149217121) --- ...mpi_deprecated_options.m4 => ompi_deleted_options.m4} | 9 +++++---- configure.ac | 4 ++-- prrte | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename config/{ompi_deprecated_options.m4 => ompi_deleted_options.m4} (73%) diff --git a/config/ompi_deprecated_options.m4 b/config/ompi_deleted_options.m4 similarity index 73% rename from config/ompi_deprecated_options.m4 rename to config/ompi_deleted_options.m4 index 17f10152bb..b6e75a3765 100644 --- a/config/ompi_deprecated_options.m4 +++ b/config/ompi_deleted_options.m4 @@ -8,17 +8,18 @@ # $HEADER$ # -AC_DEFUN([OMPI_CHECK_DEPRECATED_OPTIONS],[ - OPAL_VAR_SCOPE_PUSH(with_pmi_given with_pmi_libdir_given) +AC_DEFUN([OMPI_CHECK_DELETED_OPTIONS],[ + OPAL_VAR_SCOPE_PUSH([with_pmi_given with_pmi_libdir_given cxx]) + # --with-pmi options were removed in v5.0 AC_ARG_WITH([pmi], [AC_HELP_STRING([--with-pmi(=DIR)], - [*DEPRECATED* Build PMI support, optionally adding DIR to the search path (default: no)])], + [*DELETED* 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])], + [*DELETED* 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 diff --git a/configure.ac b/configure.ac index ff4b88c1f3..7c1cdb101c 100644 --- a/configure.ac +++ b/configure.ac @@ -192,8 +192,8 @@ if test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"; then AC_MSG_NOTICE([Detected VPATH build]) fi -# Check for deprecated options -OMPI_CHECK_DEPRECATED_OPTIONS +# Check for deprecated/deleted options +OMPI_CHECK_DELETED_OPTIONS # Setup the top of the opal/include/opal_config.h file diff --git a/prrte b/prrte index 53296629f9..c2e2231cc4 160000 --- a/prrte +++ b/prrte @@ -1 +1 @@ -Subproject commit 53296629f9aae70a6cd2586c77306a499e5b573a +Subproject commit c2e2231cc47c3df0fb3e40c130a9fecd1ca5cacf From 8d66045e95dcc660334bb2e56f1016dd67e24944 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 21 Feb 2020 08:02:13 -0800 Subject: [PATCH 2/2] Deprecate the enable-orterun-prefix-by-default options Mark the --enable-orterun-prefix-by-default and --enable-mpirun-prefix-by-default options as deprecated, but continue to honor them by translating them to the new --enable-prte-prefix-by-default option. Signed-off-by: Ralph Castain --- config/ompi_deprecated_options.m4 | 34 +++++++++++++++++++++++++++++++ config/ompi_setup_prrte.m4 | 13 +++++++++++- configure.ac | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 config/ompi_deprecated_options.m4 diff --git a/config/ompi_deprecated_options.m4 b/config/ompi_deprecated_options.m4 new file mode 100644 index 0000000000..8dd042613c --- /dev/null +++ b/config/ompi_deprecated_options.m4 @@ -0,0 +1,34 @@ +# -*- 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([enable_orterun_prefix_given]) + + # --enable-orterun-prefix-by-default was deprecated in v5 in favor of --enable-prte-prefix-by-default + AC_ARG_ENABLE([orterun-prefix-by-default], + [AC_HELP_STRING([--enable-orterun-prefix-by-default], + [*DEPRECATED* Please use --enable-prte-prefix-by-default in the future)])], + [enable_orterun_prefix_given=yes]) + AC_ARG_ENABLE([mpirun-prefix-by-default], + [AC_HELP_STRING([--enable-mpirun-prefix-by-default], + [*DEPRECATED* Please use --enable-prte-prefix-by-default in the future])], + [enable_orterun_prefix_given=yes]) + + if test "$enable_orterun_prefix_given" = "yes"; then + AC_MSG_WARN([Open MPI no longer uses the ORTE environment - it has been]) + AC_MSG_WARN([replaced by PRRTE. Accordingly, the "--enable-orterun-prefix-by-default"]) + AC_MSG_WARN([and "--enable-mpirun-prefix-by-default" options have been replaced]) + AC_MSG_WARN([by "--enable-prte-prefix-by-default". We will do the translation for]) + AC_MSG_WARN([you now, but these older options are deprecated and will be removed]) + AC_MSG_WARN([in a later release, so please update your build scripts.]) + fi + + OPAL_VAR_SCOPE_POP +]) diff --git a/config/ompi_setup_prrte.m4 b/config/ompi_setup_prrte.m4 index 9f55237ddc..3871440a0f 100644 --- a/config/ompi_setup_prrte.m4 +++ b/config/ompi_setup_prrte.m4 @@ -42,6 +42,10 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[ [AC_HELP_STRING([--with-prrte-platform], [Platform file to use when building the internal PRRTE runtime support])]) + AC_ARG_ENABLE([prte-prefix-by-default], + [AC_HELP_STRING([--enable-prte-prefix-by-default], + [Make "mpirun ..." behave exactly the same as "mpirun --prefix \$prefix" (where \$prefix is the value given to --prefix in configure) (default:enabled)])]) + AC_MSG_CHECKING([if RTE support is enabled]) if test "$enable_internal_rte" != "no"; then AC_MSG_RESULT([yes]) @@ -70,7 +74,14 @@ AC_DEFUN([OMPI_SETUP_PRRTE],[ opal_prrte_pmix_arg="--with-pmix=$with_pmix" fi - opal_prrte_args="--prefix=$prefix --disable-dlopen $opal_prrte_libevent_arg $opal_prrte_hwloc_arg $opal_prrte_pmix_arg" + if test -z $enable_prte_prefix_by_default || test "$enable_prte_prefix_by_default" = "yes" || + test "$enable_orterun_prefix_given" = "yes"; then + opal_prrte_prefix_arg="--enable-prte-prefix-by-default" + else + opal_prrte_prefix_arg= + fi + + opal_prrte_args="--prefix=$prefix --disable-dlopen $opal_prrte_prefix_arg $opal_prrte_libevent_arg $opal_prrte_hwloc_arg $opal_prrte_pmix_arg" AS_IF([test "$enable_debug" = "yes"], [opal_prrte_args="--enable-debug $opal_prrte_args" CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS -g"], diff --git a/configure.ac b/configure.ac index 7c1cdb101c..83e131d50b 100644 --- a/configure.ac +++ b/configure.ac @@ -194,6 +194,7 @@ fi # Check for deprecated/deleted options OMPI_CHECK_DELETED_OPTIONS +OMPI_CHECK_DEPRECATED_OPTIONS # Setup the top of the opal/include/opal_config.h file