diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fpp index 99c31fb299..8589a7ff52 100644 --- a/src/simulation/m_rhs.fpp +++ b/src/simulation/m_rhs.fpp @@ -68,7 +68,7 @@ module m_rhs $:GPU_DECLARE(create='[tau_Re_vf]') !> @name The cell-boundary values of the fluxes (src - source, gsrc - geometrical source). These are computed by applying the - !! chosen Riemann problem solver .on the left and right cell-boundary values of the primitive variables + !! chosen Riemann problem solver on the left and right cell-boundary values of the primitive variables !> @{ type(vector_field), allocatable, dimension(:) :: flux_n type(vector_field), allocatable, dimension(:) :: flux_src_n diff --git a/toolchain/bootstrap/modules.sh b/toolchain/bootstrap/modules.sh index 348b5c300f..fcf5750787 100644 --- a/toolchain/bootstrap/modules.sh +++ b/toolchain/bootstrap/modules.sh @@ -119,6 +119,13 @@ if [ $(echo "$VARIABLES" | grep = | wc -c) -gt 0 ]; then export $(eval "echo $VARIABLES") > /dev/null fi +UNLOAD_MODULES="$(__extract "$u_c-all-unload") $(__extract "$u_c-$cg-unload")" +UNLOAD_MODULES=$(echo "$UNLOAD_MODULES" | xargs) +if [ -n "$UNLOAD_MODULES" ]; then + log " $ module unload $UNLOAD_MODULES" + module unload $UNLOAD_MODULES +fi + # Don't check for Cray paths on Carpenter, otherwise do check if they exist if [ ! -z ${CRAY_LD_LIBRARY_PATH+x} ] && [ "$u_c" '!=' 'c' ] && [ "$u_c" '!=' 'famd' ] ; then ok "Found $M\$CRAY_LD_LIBRARY_PATH$CR. Prepending to $M\$LD_LIBRARY_PATH$CR." diff --git a/toolchain/modules b/toolchain/modules index 97d6fd4f64..f76c1be1b9 100644 --- a/toolchain/modules +++ b/toolchain/modules @@ -39,6 +39,7 @@ p-all python/3.12.5 p-cpu gcc/12.3.0 openmpi/4.1.5 p-gpu python/3.12.5 nvhpc/24.5 hpcx/2.19-cuda cuda/12.1.1 p-gpu MFC_CUDA_CC=70,75,80,89,90 NVHPC_CUDA_HOME=$CUDA_HOME CC=nvc CXX=nvc++ FC=nvfortran +p-gpu-unload xalt f OLCF Frontier 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 t WPI Turing t-all slurm -t-cpu gcc/12.1.0/i6yk33f openmpi/4.1.3/ebae7zc python/3.13.5/6anz4qy \ No newline at end of file +t-cpu gcc/12.1.0/i6yk33f openmpi/4.1.3/ebae7zc python/3.13.5/6anz4qy