Update toolchain to support swapping between OpenACC and OpenMP

Author: prathi-wind

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='?', default=gpuConfigOptions.ACC.value, choices=[e.value for e in gpuConfigOptions])
+                    p.add_argument(f"--{f.name}", action="store", nargs='?', 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"--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/state.py

@@ -35,12 +35,24 @@ def items(self) -> typing.Iterable[typing.Tuple[str, typing.Any]]:
     def make_options(self) -> typing.List[str]:
         """ Returns a list of options that could be passed to mfc.sh again.
             Example: --no-debug --mpi --no-gpu --no-gcov --no-unified"""
-        return [ f"--{'no-' if not v else ''}{k}" for k, v in self.items() ]
+        options = []
+        for k, v in self.items():
+            if (k == 'gpu'):
+                options.append(f"--{v}-{k}")
+            else:
+                options.append(f"--{'no-' if not v else ''}{k}")
+        return options
 
     def make_slug(self) -> str:
         """ Sort the items by key, then join them with underscores. This uniquely 
             identifies the configuration. Example: no-debug_no-gpu_no_mpi_no-gcov """
-        return '_'.join([ f"{'no-' if not v else ''}{k}" for k, v in sorted(self.items(), key=lambda x: x[0]) ])
+        options = []
+        for k, v in sorted(self.items(), key=lambda x: x[0]):
+            if (k == 'gpu'):
+                options.append(f"--{v}-{k}")
+            else:
+                options.append(f"--{'no-' if not v else ''}{k}")
+        return '_'.join(options)
 
     def __eq__(self, other) -> bool:
         """ Check if two MFCConfig objects are equal, field by field. """