Skip to content

Commit bb10bcd

Browse files
authored
Support module unload in modules file; unload xalt on Phoenix GPU (#1387)
1 parent 6787ae4 commit bb10bcd

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

src/simulation/m_rhs.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ module m_rhs
6868
$:GPU_DECLARE(create='[tau_Re_vf]')
6969

7070
!> @name The cell-boundary values of the fluxes (src - source, gsrc - geometrical source). These are computed by applying the
71-
!! chosen Riemann problem solver .on the left and right cell-boundary values of the primitive variables
71+
!! chosen Riemann problem solver on the left and right cell-boundary values of the primitive variables
7272
!> @{
7373
type(vector_field), allocatable, dimension(:) :: flux_n
7474
type(vector_field), allocatable, dimension(:) :: flux_src_n

toolchain/bootstrap/modules.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ if [ $(echo "$VARIABLES" | grep = | wc -c) -gt 0 ]; then
119119
export $(eval "echo $VARIABLES") > /dev/null
120120
fi
121121

122+
UNLOAD_MODULES="$(__extract "$u_c-all-unload") $(__extract "$u_c-$cg-unload")"
123+
UNLOAD_MODULES=$(echo "$UNLOAD_MODULES" | xargs)
124+
if [ -n "$UNLOAD_MODULES" ]; then
125+
log " $ module unload $UNLOAD_MODULES"
126+
module unload $UNLOAD_MODULES
127+
fi
128+
122129
# Don't check for Cray paths on Carpenter, otherwise do check if they exist
123130
if [ ! -z ${CRAY_LD_LIBRARY_PATH+x} ] && [ "$u_c" '!=' 'c' ] && [ "$u_c" '!=' 'famd' ] ; then
124131
ok "Found $M\$CRAY_LD_LIBRARY_PATH$CR. Prepending to $M\$LD_LIBRARY_PATH$CR."

toolchain/modules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ p-all python/3.12.5
3939
p-cpu gcc/12.3.0 openmpi/4.1.5
4040
p-gpu python/3.12.5 nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1
4141
p-gpu MFC_CUDA_CC=70,75,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran
42+
p-gpu-unload xalt
4243

4344
f OLCF Frontier
4445
f-all cpe/25.03 rocm/6.3.1
@@ -113,4 +114,4 @@ h-gpu NVCOMPILER_COMM_LIBS_HOME=/apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/com
113114

114115
t WPI Turing
115116
t-all slurm
116-
t-cpu gcc/12.1.0/i6yk33f openmpi/4.1.3/ebae7zc python/3.13.5/6anz4qy
117+
t-cpu gcc/12.1.0/i6yk33f openmpi/4.1.3/ebae7zc python/3.13.5/6anz4qy

0 commit comments

Comments
 (0)