Skip to content

Commit

Permalink
Make Darwin tests use CUDA 12.0 so we can test EMHD on Nvidia
Browse files Browse the repository at this point in the history
  • Loading branch information
bprather committed Sep 13, 2024
1 parent 04908a1 commit ba56f92
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
12 changes: 9 additions & 3 deletions machines/darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ if [[ ($HOSTNAME == "cn"* || $HOSTNAME == "darwin"*) &&

# 2. Load accelerator libraries
if [[ "$ARGS" == *"cuda"* ]]; then
module load cuda/12.3.1
if [[ "$ARGS" == *"cuda11"* ]]; then
module load cuda/11.8.0
elif [[ "$ARGS" == *"cuda120"* ]]; then
module load cuda/12.0.0
else
module load cuda/12.3.1
fi
# Host MPI for CUDA w/o NVHPC
if [[ "$C_NATIVE" != "nvc" ]]; then
module load openmpi
Expand Down Expand Up @@ -141,7 +147,7 @@ if [[ ($HOSTNAME == "cn"* || $HOSTNAME == "darwin"*) &&
MPI_NUM_PROCS=${MPI_NUM_PROCS:-$MPI_NUM_PROCS_D}

# Runtime
MPI_EXE="mpirun"
#MPI_EXE="mpirun"
# Lead MPI to water
MPI_EXTRA_ARGS="--map-by ppr:${MPI_NUM_PROCS}:node:pe=$(($NPROC / $MPI_NUM_PROCS / $NODE_SLICE))"
#MPI_EXTRA_ARGS="--map-by ppr:${MPI_NUM_PROCS}:node:pe=$(($NPROC / $MPI_NUM_PROCS / $NODE_SLICE))"
fi
7 changes: 4 additions & 3 deletions scripts/ci/darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ build:
before_script:
- echo "Skipping pyharm install in build."
script:
- ./make.sh clean cuda gcc volta
# CUDA 12.2+ doesn't like EMHD
- ./make.sh clean cuda120 gcc volta
artifacts:
paths:
- kharma.*
Expand All @@ -74,6 +75,6 @@ tests:
- ./run.sh
parallel:
matrix:
- TEST: [bondi, bondi_viscous, bz_monopole, emhdmodes, mhdmodes, mhdmodes_smr,
noh, regrid, reinit, restart, tilt_init, torus_sanity]
- TEST: [all_pars, anisotropic_conduction, bondi, bondi_viscous, bz_monopole, conducting_atmosphere,
emhdmodes, mhdmodes, mhdmodes_smr, noh, regrid, reinit, resize, restart, tilt_init, torus_sanity]

0 comments on commit ba56f92

Please sign in to comment.