From f83d6045aaed2b2981c957f8e8405b149262ce02 Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Tue, 11 Nov 2014 21:49:28 +0200 Subject: [PATCH] ORTE: undeprecate -x var=val in mpirun mpirun -x var=val is back, actually it is useful alias for -mca mca_base_env_list "var=val" --- orte/tools/orterun/help-orterun.txt | 21 ++------------------- orte/tools/orterun/orterun.c | 2 -- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/orte/tools/orterun/help-orterun.txt b/orte/tools/orterun/help-orterun.txt index 42d64f52c2..ee43237b02 100644 --- a/orte/tools/orterun/help-orterun.txt +++ b/orte/tools/orterun/help-orterun.txt @@ -651,29 +651,12 @@ The job will now be aborted. Please check your code and/or adjust/remove the job execution time limit (as specified by MPIEXEC_TIMEOUT in your environment). # -[orterun:deprecated-env-set] -WARNING: The mechanism by which environment variables are explicitly -passed to Open MPI has changed! - -Specifically, beginning in the 1.9.x/2.0.x series, using "-x" to set -environment variables is deprecated. Please use the -"mca_base_env_list" MCA parameter, instead. - -For example, this invocation using the old "-x" mechanism: - - mpirun -x env_foo1=bar1 -x env_foo2=bar2 -x env_foo3 ... - -is equivalent to this invocation using the new "mca_base_env_list" -mechanism: - - mpirun -mca mca_base_env_list 'env_foo1=bar1;env_foo2=bar2;env_foo3' ... -# [orterun:conflict-env-set] ERROR: You have attempted to pass environment variables to Open MPI -with both the "-x" method (deprecated starting in the 1.9.x/2.0.x -series) and by setting the MCA parameter "mca_base_env_list". +with both the "-x" method and by setting the MCA parameter "mca_base_env_list". Open MPI does not support mixing these two methods. Please choose one method and try launching your job again. Your job will now abort. +# diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index 4a96fe677c..9c6ae1371a 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -1737,8 +1737,6 @@ static int create_app(int argc, char* argv[], if (NULL != env_set_flag) { orte_show_help("help-orterun.txt", "orterun:conflict-env-set", false); return ORTE_ERR_FATAL; - } else { - orte_show_help("help-orterun.txt", "orterun:deprecated-env-set", false); } j = opal_cmd_line_get_ninsts(&cmd_line, "x"); for (i = 0; i < j; ++i) {