Updated template to not request GPU resources on CPU builds

prathi-wind · prathi-wind · commit bd058f881d5f · 2025-11-19T11:54:16.000-05:00
diff --git a/toolchain/templates/bridges2.mako b/toolchain/templates/bridges2.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -14,7 +15,7 @@
 % if account:
 #SBATCH --account="${account}"
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpu-bind=verbose,closest
 #SBATCH --gres=gpu:v100-16:${tasks_per_node}
 % endif
diff --git a/toolchain/templates/carpenter-cray.mako b/toolchain/templates/carpenter-cray.mako
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
+
 
 % if engine == 'batch':
 #PBS -l select=${nodes}:ncpus=192:mpiprocs=${tasks_per_node}
diff --git a/toolchain/templates/carpenter.mako b/toolchain/templates/carpenter.mako
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
+
 
 % if engine == 'batch':
 #PBS -l select=${nodes}:ncpus=192:mpiprocs=${tasks_per_node}
diff --git a/toolchain/templates/default.mako b/toolchain/templates/default.mako
@@ -2,6 +2,8 @@
 import os
 from mako.exceptions import RuntimeException
 %>
+<%! from mfc.state import gpuConfigOptions %>
+
 % if os.name == 'nt':
 @echo off
 % else:
diff --git a/toolchain/templates/delta.mako b/toolchain/templates/delta.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -14,7 +15,7 @@
 % if account:
 #SBATCH --account="${account}"
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpus-per-node=${tasks_per_node}
 #SBATCH --mem=208G
 #SBATCH --gpu-bind=closest
diff --git a/toolchain/templates/deltaai.mako b/toolchain/templates/deltaai.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -14,7 +15,7 @@
 % if account:
 #SBATCH --account="${account}"
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpus-per-node=${tasks_per_node}
 #SBATCH --mem=208G
 #SBATCH --gpu-bind=closest
diff --git a/toolchain/templates/frontier.mako b/toolchain/templates/frontier.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -10,7 +11,7 @@
 #SBATCH --time=${walltime}
 #SBATCH --cpus-per-task=7
 #SBATCH -C nvme
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpus-per-task=1
 #SBATCH --gpu-bind=closest
 % endif
@@ -39,7 +40,7 @@ cd "${MFC_ROOT_DIR}"
 cd - > /dev/null
 echo
 
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
     export MPICH_GPU_SUPPORT_ENABLED=1
 % else:
     export MPICH_GPU_SUPPORT_ENABLED=0
@@ -66,7 +67,7 @@ ulimit -s unlimited
         % if engine == 'interactive':
                 --unbuffered --nodes ${nodes} --ntasks-per-node ${tasks_per_node} \
                 --cpus-per-task 7                                    \
-            % if gpu:
+            % if gpu != gpuConfigOptions.NONE.value:
                 --gpus-per-task 1 --gpu-bind closest                 \
             % endif
             ${profiler} "${target.get_install_binpath(case)}")
diff --git a/toolchain/templates/hipergator.mako b/toolchain/templates/hipergator.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -9,7 +10,7 @@
 #SBATCH --output="${name}.out"
 #SBATCH --time=${walltime}
 #SBATCH --cpus-per-task=7
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpus-per-task=1
 #SBATCH --gpu-bind=closest
 % endif
diff --git a/toolchain/templates/nautilus.mako b/toolchain/templates/nautilus.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -14,7 +15,7 @@
 % if account:
 #SBATCH --account="${account}"
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpu-bind=verbose,closest
 #SBATCH --gres=gpu:v100-16:${tasks_per_node}
 % endif
diff --git a/toolchain/templates/oscar.mako b/toolchain/templates/oscar.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -14,7 +15,7 @@
 % if account:
 #SBATCH --account="${account}"
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gpus-per-node=${tasks_per_node}
 #SBATCH --mem=64G
 #SBATCH --gpu-bind=closest
diff --git a/toolchain/templates/phoenix-bench.mako b/toolchain/templates/phoenix-bench.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -17,7 +18,7 @@
 % if quality_of_service:
 #SBATCH --qos=${quality_of_service}
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gres=gpu:V100:${tasks_per_node}
 #SBATCH --mem-per-gpu=16G\
 % endif
diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --nodes=${nodes}
@@ -17,7 +18,7 @@
 % if quality_of_service:
 #SBATCH --qos=${quality_of_service}
 % endif
-% if gpu:
+% if gpu != gpuConfigOptions.NONE.value:
 #SBATCH --gres=gpu:V100:${tasks_per_node}
 #SBATCH --mem-per-gpu=16G\
 % endif
@@ -34,6 +35,11 @@ cd "${MFC_ROOT_DIR}"
 . ./mfc.sh load -c p -m ${'g' if gpu else 'c'}
 cd - > /dev/null
 echo
+% if gpu != gpuConfigOptions.NONE.value:
+echo "GPU active"
+% else:
+echo "CPU active"
+% endif
 
 % for target in targets:
     ${helpers.run_prologue(target)}
diff --git a/toolchain/templates/santis.mako b/toolchain/templates/santis.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #SBATCH --uenv=icon/25.2:v1@santis
@@ -74,7 +75,7 @@ echo
                 --ntasks=${nodes*tasks_per_node}                     \
                 --cpus-per-task 72                                   \
                 --cpu-bind=none                                      \
-            % if gpu:
+            % if gpu != gpuConfigOptions.NONE.value:
                 --gpus-per-task 1                                    \
             % endif
                 --wait 200 --bcast=/tmp/${target.name}               \
diff --git a/toolchain/templates/summit.mako b/toolchain/templates/summit.mako
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 <%namespace name="helpers" file="helpers.mako"/>
+<%! from mfc.state import gpuConfigOptions %>
 
 % if engine == 'batch':
 #BSUB -J {{{name}}}
