From 38d5f77bfb6e8948e1ed56443f5b7a70c5f24007 Mon Sep 17 00:00:00 2001
From: Hyunju Oh <oh.693@osu.edu>
Date: Fri, 23 Feb 2024 18:48:21 -0500
Subject: [PATCH] Removing gres option for ctest (#182)

* Removing gres option for ctest
* Removing gres option from scripts
* Update check for core

---------

Co-authored-by: Hyunju Oh <hjoh16@login15.chn.perlmutter.nersc.gov>
Co-authored-by: Jean Luca Bez <jlbez@lbl.gov>
---
 examples/mpi_test.sh                     | 4 ++--
 examples/multiple_mpi_test.sh            | 4 ++--
 examples/run_checkpoint_restart_test.sh  | 4 ++--
 examples/run_multiple_test.sh            | 4 ++--
 examples/run_test.sh                     | 4 ++--
 examples/script_cori_shared.sh           | 4 ++--
 src/tests/mpi_test.sh                    | 5 +----
 src/tests/run_checkpoint_restart_test.sh | 4 ++--
 src/tests/run_multiple_test.sh           | 4 ++--
 src/tests/run_test.sh                    | 4 ++--
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/examples/mpi_test.sh b/examples/mpi_test.sh
index de962fcaa..99b710919 100755
--- a/examples/mpi_test.sh
+++ b/examples/mpi_test.sh
@@ -4,8 +4,8 @@
 # defined and points to the MPI libraries used by the linker (e.g. -L<path -lmpi)
 
 extra_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    extra_cmd="--mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap "
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    extra_cmd="--mem=25600 --cpu_bind=cores --overlap "
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/examples/multiple_mpi_test.sh b/examples/multiple_mpi_test.sh
index 0ca955b24..edbef069c 100755
--- a/examples/multiple_mpi_test.sh
+++ b/examples/multiple_mpi_test.sh
@@ -7,8 +7,8 @@ if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
 
 extra_cmd=""
 
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    extra_cmd="--mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap "
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    extra_cmd="--mem=25600 --cpu_bind=cores --overlap "
 fi
 # check the test to be run:
 # test_exe="$1"
diff --git a/examples/run_checkpoint_restart_test.sh b/examples/run_checkpoint_restart_test.sh
index 4986589d6..d2990890d 100644
--- a/examples/run_checkpoint_restart_test.sh
+++ b/examples/run_checkpoint_restart_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap"
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/examples/run_multiple_test.sh b/examples/run_multiple_test.sh
index ffb8ff1fc..e6044745b 100755
--- a/examples/run_multiple_test.sh
+++ b/examples/run_multiple_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap"
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/examples/run_test.sh b/examples/run_test.sh
index 5aed4d817..2b6943d7a 100755
--- a/examples/run_test.sh
+++ b/examples/run_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap "
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap "
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/examples/script_cori_shared.sh b/examples/script_cori_shared.sh
index 0e67cc3df..01fc0bd6b 100755
--- a/examples/script_cori_shared.sh
+++ b/examples/script_cori_shared.sh
@@ -11,8 +11,8 @@
 #SBATCH -e qout.%j
 
 ulimit -n 63536
-COMMON_CMD="--gres=craynetwork:1 --mem=51200 --overlap"
-SERVER_COMMON_CMD="--gres=craynetwork:1 --mem=21600 --overlap"
+COMMON_CMD="--mem=51200 --overlap"
+SERVER_COMMON_CMD="--mem=21600 --overlap"
 ###########       Programs Location      ############
 OUTDIR=$SCRATCH/VPIC
 #-N $SLURM_JOB_NUM_NODES
diff --git a/src/tests/mpi_test.sh b/src/tests/mpi_test.sh
index a434fbf07..1cde01784 100755
--- a/src/tests/mpi_test.sh
+++ b/src/tests/mpi_test.sh
@@ -4,12 +4,9 @@
 # defined and points to the MPI libraries used by the linker (e.g. -L<path -lmpi)
 
 extra_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    extra_cmd="--mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap "
-fi
 
 if [[ "$SUPERCOMPUTER" == "perlmutter" ]]; then
-    extra_cmd="--cpu_bind=cores --overlap "
+    extra_cmd="--mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/src/tests/run_checkpoint_restart_test.sh b/src/tests/run_checkpoint_restart_test.sh
index 4986589d6..08b868e19 100755
--- a/src/tests/run_checkpoint_restart_test.sh
+++ b/src/tests/run_checkpoint_restart_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap"
+if [[ "$NERSC_HOST" == "perlmutter"  ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/src/tests/run_multiple_test.sh b/src/tests/run_multiple_test.sh
index ffb8ff1fc..e6044745b 100755
--- a/src/tests/run_multiple_test.sh
+++ b/src/tests/run_multiple_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap"
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi
diff --git a/src/tests/run_test.sh b/src/tests/run_test.sh
index 7fc0e74f0..3dcd165ac 100755
--- a/src/tests/run_test.sh
+++ b/src/tests/run_test.sh
@@ -5,8 +5,8 @@
 
 # Cori CI needs srun even for serial tests
 run_cmd=""
-if [[ "$HOSTNAME" == "cori"* || "$HOSTNAME" == "nid"* ]]; then
-    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --gres=craynetwork:1 --overlap "
+if [[ "$NERSC_HOST" == "perlmutter" ]]; then
+    run_cmd="srun -n 1 --mem=25600 --cpu_bind=cores --overlap"
 fi
 
 if [ $# -lt 1 ]; then echo "missing test argument" && exit -1 ; fi