Merge pull request #8354 from wickberg/revert-8289-cmr41/slurm

Revert "v4.1.x: Update Slurm launch support"

Author: jsquyres

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");