From 08020aafc6b5b604316631228433f10ae54e3263 Mon Sep 17 00:00:00 2001 From: Tim Wickberg Date: Thu, 7 Jan 2021 22:18:35 -0700 Subject: [PATCH] Revert "v4.1.x: Update Slurm launch support" Signed-off-by: Tim Wickberg --- orte/mca/plm/slurm/plm_slurm_module.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index f05ea44e8d8..f8de6509e95 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -12,7 +12,7 @@ * Copyright (c) 2006-2019 Cisco Systems, Inc. All rights reserved * Copyright (c) 2007-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. + * Copyright (c) 2014-2017 Intel, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -267,9 +267,6 @@ static void launch_daemons(int fd, short args, void *cbdata) /* start one orted on each node */ opal_argv_append(&argc, &argv, "--ntasks-per-node=1"); - /* ensure Slurm adds all CPUs to this task */ - putenv("SLURM_WHOLE=1"); - if (!orte_enable_recovery) { /* kill the job if any orteds die */ opal_argv_append(&argc, &argv, "--kill-on-bad-exit");