From dcc7632e6eb00fad7c55955e220987129856b35a Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Sun, 17 May 2020 19:23:14 -0600 Subject: [PATCH] On rzansel, do not use the --pack lrun/jsrun option. + The `--pack` option assumes tests only use one core and one thread. This is not appropriate for most Draco tests. + Also set an environment variable to prevent warnings about oversubscribing. --- config/setupMPI.cmake | 8 ++++++-- environment/bashrc/.bashrc_ats2 | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config/setupMPI.cmake b/config/setupMPI.cmake index b8fe211754..c194ca5f3a 100644 --- a/config/setupMPI.cmake +++ b/config/setupMPI.cmake @@ -377,7 +377,11 @@ macro( setupSpectrumMPI ) # total # - jsrun -a4 -c16 -g2 => 4 tasks, 16 cores, 2 gpus - set( MPIEXEC_PREFLAGS "--pack --threads=1 --bind=off -v") + set( MPIEXEC_PREFLAGS "--threads=1 --bind=off -v") + # --pack ==> -c 1 -g 0. This is actually bad for us. Disable + # lrun -n 2 -c 10 --threads=10 --bind=off ==> + # jsrun --np 1 --nrs 1 -c ALL_CPUS -g ALL_GPUS -d plane:1 -b rs -X 1 + # consider: jsrun --np 2 --nrs 1 -c 10 -g 0 -bind none # # Setup for OMP plus MPI @@ -385,7 +389,7 @@ macro( setupSpectrumMPI ) if( DEFINED ENV{OMP_NUM_THREADS} ) # set( MPIEXEC_OMP_PREFLAGS "-c $ENV{OMP_NUM_THREADS}" ) - set( MPIEXEC_OMP_PREFLAGS "--pack -c $ENV{OMP_NUM_THREADS} --threads=$ENV{OMP_NUM_THREADS} --bind=off -v" ) + set( MPIEXEC_OMP_PREFLAGS "-c $ENV{OMP_NUM_THREADS} --threads=$ENV{OMP_NUM_THREADS} --bind=off -v" ) endif() set( MPIEXEC_OMP_PREFLAGS ${MPIEXEC_OMP_PREFLAGS} diff --git a/environment/bashrc/.bashrc_ats2 b/environment/bashrc/.bashrc_ats2 index 17f351c966..71b5753e10 100644 --- a/environment/bashrc/.bashrc_ats2 +++ b/environment/bashrc/.bashrc_ats2 @@ -17,6 +17,7 @@ ulimit -s unlimited # Where is the vendor directory export PATH=${VENDOR_DIR:=/usr/gapps/jayenne/vendors}/bin:$PATH export VENDOR_DIR +export JSM_JSRUN_NO_WARN_OVERSUBSCRIBE=1 # # MODULES