fix ups on formatting and some defaults

Author: sbryngelson

toolchain/mfc/args.py

@@ -59,7 +59,7 @@ def add_common_arguments(p: argparse.ArgumentParser, mask = None):
         if "m" not in mask:
             for f in dataclasses.fields(config):
                 if f.name == 'gpu':
-                    p.add_argument(f"--{f.name}", action="store", nargs='?', const= gpuConfigOptions.ACC.value,default=gpuConfigOptions.ACC.value, dest=f.name, choices=[e.value for e in gpuConfigOptions], help=f"Turn the {f.name} option to OpenACC or OpenMP.")
+                    p.add_argument(f"--{f.name}", action="store", nargs='?', const= gpuConfigOptions.ACC.value,default=gpuConfigOptions.NONE.value, dest=f.name, choices=[e.value for e in gpuConfigOptions], help=f"Turn the {f.name} option to OpenACC or OpenMP.")
                     p.add_argument(f"--no-{f.name}", action="store_const", const = gpuConfigOptions.NONE.value, dest=f.name, help=f"Turn the {f.name} option OFF.")
                     continue
                 p.add_argument(   f"--{f.name}", action="store_true",               help=f"Turn the {f.name} option ON.")

toolchain/mfc/run/run.py

@@ -101,9 +101,17 @@ def __generate_job_script(targets, case: input.MFCInputFile):
 
     # Compute GPU mode booleans for templates
     gpu_mode = ARG('gpu')
-    gpu_enabled = (gpu_mode != gpuConfigOptions.NONE.value)
-    gpu_acc = (gpu_mode == gpuConfigOptions.ACC.value)
-    gpu_mp = (gpu_mode == gpuConfigOptions.MP.value)
+
+    # Validate gpu_mode is one of the expected values
+    valid_gpu_modes = {e.value for e in gpuConfigOptions}
+    if gpu_mode not in valid_gpu_modes:
+        raise MFCException(
+            f"Invalid GPU mode '{gpu_mode}'. Must be one of: {', '.join(sorted(valid_gpu_modes))}"
+        )
+
+    gpu_enabled = gpu_mode != gpuConfigOptions.NONE.value
+    gpu_acc = gpu_mode == gpuConfigOptions.ACC.value
+    gpu_mp = gpu_mode == gpuConfigOptions.MP.value
 
     content = __get_template().render(
         **{**ARGS(), 'targets': targets},

toolchain/templates/frontier.mako

@@ -45,7 +45,7 @@ echo
     export MPICH_GPU_SUPPORT_ENABLED=0
 % endif
 
-%if unified:
+% if unified:
     export CRAY_ACC_USE_UNIFIED_MEM=1
 % endif
 

toolchain/templates/phoenix.mako

@@ -19,7 +19,7 @@
 % endif
 % if gpu_enabled:
 #SBATCH --gres=gpu:V100:${tasks_per_node}
-#SBATCH --mem-per-gpu=16G\
+#SBATCH --mem-per-gpu=16G
 % endif
 % if email:
 #SBATCH --mail-user=${email}