From fa2d52683b08ce01c1fa8f3de589dcb83077dc8e Mon Sep 17 00:00:00 2001
From: Spencer Bryngelson <shb@gatech.edu>
Date: Thu, 4 Dec 2025 11:48:07 -0500
Subject: [PATCH 1/3] Update GPU condition checks in frontier.mako

---
 toolchain/templates/frontier.mako | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/toolchain/templates/frontier.mako b/toolchain/templates/frontier.mako
index b6d4a9a887..7a27d8588b 100644
--- a/toolchain/templates/frontier.mako
+++ b/toolchain/templates/frontier.mako
@@ -10,7 +10,7 @@
 #SBATCH --time=${walltime}
 #SBATCH --cpus-per-task=7
 #SBATCH -C nvme
-% if gpu:
+% if gpu != 'no':
 #SBATCH --gpus-per-task=1
 #SBATCH --gpu-bind=closest
 % endif
@@ -34,12 +34,12 @@ ${helpers.template_prologue()}
 ok ":) Loading modules:\n"
 cd "${MFC_ROOT_DIR}"
 % if engine == 'batch':
-. ./mfc.sh load -c f -m ${'g' if gpu else 'c'}
+. ./mfc.sh load -c f -m ${'g' if gpu != 'no' else 'c'}
 % endif
 cd - > /dev/null
 echo
 
-% if gpu:
+% if gpu != 'no':
     export MPICH_GPU_SUPPORT_ENABLED=1
 % else:
     export MPICH_GPU_SUPPORT_ENABLED=0
@@ -66,7 +66,7 @@ ulimit -s unlimited
         % if engine == 'interactive':
                 --unbuffered --nodes ${nodes} --ntasks-per-node ${tasks_per_node} \
                 --cpus-per-task 7                                    \
-            % if gpu:
+            % if gpu != 'no':
                 --gpus-per-task 1 --gpu-bind closest                 \
             % endif
             ${profiler} "${target.get_install_binpath(case)}")

From 9eb317b0a1882414a2fa3d9f1e493b4e24834488 Mon Sep 17 00:00:00 2001
From: Spencer Bryngelson <shb@gatech.edu>
Date: Thu, 4 Dec 2025 11:48:59 -0500
Subject: [PATCH 2/3] Modify device type handling in submit.sh

---
 .github/workflows/frontier/submit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontier/submit.sh b/.github/workflows/frontier/submit.sh
index 46eb3d09db..4f846fd5e9 100644
--- a/.github/workflows/frontier/submit.sh
+++ b/.github/workflows/frontier/submit.sh
@@ -48,7 +48,7 @@ job_slug="$job_slug"
 job_device="$2"
 job_interface="$3"
 
-. ./mfc.sh load -c f -m g
+. ./mfc.sh load -c f -m $([ "$2" = "gpu" ] && echo "g" || echo "c")
 
 $sbatch_script_contents
 

From 3d4ff7d11a25f16bcf3ba05401cfde0af52139f8 Mon Sep 17 00:00:00 2001
From: Spencer Bryngelson <shb@gatech.edu>
Date: Thu, 4 Dec 2025 11:49:19 -0500
Subject: [PATCH 3/3] Add no-gpu option for non-GPU device tests

---
 .github/workflows/frontier/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontier/test.sh b/.github/workflows/frontier/test.sh
index 8c51afc320..dd678d53c9 100644
--- a/.github/workflows/frontier/test.sh
+++ b/.github/workflows/frontier/test.sh
@@ -16,5 +16,5 @@ fi
 if [ "$job_device" = "gpu" ]; then
     ./mfc.sh test -a --rdma-mpi --max-attempts 3 -j $ngpus $device_opts -- -c frontier
 else
-    ./mfc.sh test -a --max-attempts 3 -j 32 -- -c frontier
+    ./mfc.sh test -a --max-attempts 3 -j 32 --no-gpu -- -c frontier
 fi