Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing gres option for ctest #182

Merged
merged 6 commits into from
Feb 23, 2024
Merged

Removing gres option for ctest #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
300fb73
Removing gres option for ctest
Feb 7, 2024
111e216
Removing gres option from scripts
Feb 12, 2024
918ab9e
Removing gres option from scripts
Feb 20, 2024
8003b66
Update check for core
Feb 20, 2024
8e9d1d9
Update check for core
Feb 23, 2024
1f14fda
Merge branch 'develop' into develop
jeanbez Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/mpi_test.sh
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading