Skip to content

Commit

Permalink
Removing gres option for ctest (#182)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@hyunjuooh @jeanbez
3 people authored Feb 23, 2024
1 parent f8d5f8d commit 38d5f77
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 22 deletions.
4 changes: 2 additions & 2 deletions examples/mpi_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/multiple_mpi_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions examples/run_checkpoint_restart_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/run_multiple_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/run_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/script_cori_shared.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions src/tests/mpi_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/tests/run_checkpoint_restart_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/tests/run_multiple_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/tests/run_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 38d5f77

Please sign in to comment.