From ae690f5f978f0d0d950bae65ecb73065626410db Mon Sep 17 00:00:00 2001 From: Ben Wilfong <48168887+wilfonba@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:53:46 -0400 Subject: [PATCH 1/4] update phoenix template --- toolchain/templates/phoenix.mako | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako index e5e139905f..5018ef296b 100644 --- a/toolchain/templates/phoenix.mako +++ b/toolchain/templates/phoenix.mako @@ -41,10 +41,15 @@ echo % if not mpi: (set -x; ${profiler} "${target.get_install_binpath(case)}") % else: - (set -x; ${profiler} \ - mpirun -np ${nodes*tasks_per_node} \ - --bind-to none \ - "${target.get_install_binpath(case)}") + (set -x; srun \ + % if engine == 'interactive': + --nodes ${nodes} --ntasks-per-node ${tasks_per_node} \ + --cpus-per-task 1 \ + % if gpu: + --gpus-per-task 1 --gpu-bind closest \ + % endif + % endif + ${profiler} "${target.get_install_binpath(case)}") % endif ${helpers.run_epilogue(target)} From ba0c4ec4545edfe11c2982c9ef457afcf5cd5522 Mon Sep 17 00:00:00 2001 From: Benjamin Alexander Wilfong Date: Wed, 23 Apr 2025 16:30:09 -0400 Subject: [PATCH 2/4] update --- toolchain/templates/phoenix.mako | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako index 5018ef296b..a43805586a 100644 --- a/toolchain/templates/phoenix.mako +++ b/toolchain/templates/phoenix.mako @@ -18,8 +18,7 @@ #SBATCH --qos=${quality_of_service} % endif % if gpu: -#SBATCH --gres=gpu:V100:${tasks_per_node} -#SBATCH --mem-per-gpu=16G\ +#SBATCH -G${tasks_per_node} % endif % if email: #SBATCH --mail-user=${email} From 2207581e881f6cd259585840476408d0d56925ee Mon Sep 17 00:00:00 2001 From: Ben Wilfong <48168887+wilfonba@users.noreply.github.com> Date: Thu, 24 Apr 2025 21:28:43 -0400 Subject: [PATCH 3/4] edit src --- src/simulation/m_time_steppers.fpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/simulation/m_time_steppers.fpp b/src/simulation/m_time_steppers.fpp index 045dfda597..5b734640f8 100644 --- a/src/simulation/m_time_steppers.fpp +++ b/src/simulation/m_time_steppers.fpp @@ -1148,7 +1148,7 @@ contains if (proc_rank == 0) print *, 'RKCK 5th time-stage at', rkck_time_tmp #endif call s_compute_rhs(q_cons_ts(2)%vf, q_T_sf, q_prim_vf, rhs_ts_rkck(5)%vf, pb_ts(1)%sf, rhs_pb, mv_ts(1)%sf, rhs_mv, t_step, time_avg) - call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(5)%vf, 5) + call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(5)%vf, RKstep) call s_update_tmp_rkck(5, q_cons_ts, rhs_ts_rkck, lag_largestep) if (lag_largestep > 0._wp) call s_compute_rkck_dt(lag_largestep, restart_rkck_step) if (restart_rkck_step) cycle @@ -1162,7 +1162,7 @@ contains if (proc_rank == 0) print *, 'RKCK 6th time-stage at', rkck_time_tmp #endif call s_compute_rhs(q_cons_ts(2)%vf, q_T_sf, q_prim_vf, rhs_ts_rkck(6)%vf, pb_ts(1)%sf, rhs_pb, mv_ts(1)%sf, rhs_mv, t_step, time_avg) - call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(6)%vf, 6) + call s_compute_EL_coupled_solver(q_cons_ts(2)%vf, q_prim_vf, rhs_ts_rkck(6)%vf, RKstep) call s_update_tmp_rkck(6, q_cons_ts, rhs_ts_rkck, lag_largestep) if (lag_largestep > 0._wp) call s_compute_rkck_dt(lag_largestep, restart_rkck_step) if (restart_rkck_step) cycle From ac3c4e57346d29fb9462bd5f712a2cacc999d343 Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Fri, 25 Apr 2025 16:59:00 -0400 Subject: [PATCH 4/4] Update submit.sh --- .github/workflows/phoenix/submit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phoenix/submit.sh b/.github/workflows/phoenix/submit.sh index caa9459e1d..1359fe653f 100644 --- a/.github/workflows/phoenix/submit.sh +++ b/.github/workflows/phoenix/submit.sh @@ -42,7 +42,7 @@ sbatch <