test: Update template tests configuration generation

Author: b-butler

tests/generate_template_reference_data.py

@@ -9,12 +9,12 @@
 import operator
 import os
 import sys
+from contextlib import redirect_stdout
 from hashlib import sha1
 
 import jinja2
 import signac
 from define_template_test_project import TestProject
-from test_project import redirect_stdout
 
 import flow
 import flow.environments
@@ -28,11 +28,16 @@
 PROJECT_DIRECTORY = '/home/user/path with spaces and "quotes" and \\backslashes/'
 MOCK_EXECUTABLE = "/usr/local/bin/python"
 DEFAULT_BUNDLES = [
-    ("omp_op", "parallel_op"),
-    ("mpi_op", "op", "memory_op"),
-    ("hybrid_op", "omp_op"),
+    {"bundles": [("omp_op", "parallel_op")], "parallel": [True, False]},
+    {"bundles": [("mpi_op", "op", "memory_op")], "parallel": [False]},
+    {"bundles": [("hybrid_op", "omp_op")], "parallel": [False]},
 ]
-DEFAULT_SETTING = {"bundles": DEFAULT_BUNDLES, "parallel": [True, False]}
+
+
+def set_bundles(partitions=None):
+    if partitions is None:
+        return DEFAULT_BUNDLES
+    return [{"partition": partitions, **bundle} for bundle in DEFAULT_BUNDLES]
 
 
 def cartesian(**kwargs):
@@ -71,45 +76,37 @@ def init(project):
     environments = {
         "environment.StandardEnvironment": [],
         "environments.xsede.Bridges2Environment": [
-            {
-                "partition": ["RM", "RM-shared", "GPU", "GPU-shared"],
-            },
-            {"partition": ["RM"], **DEFAULT_SETTING},
+            {"partition": ["RM", "RM-shared", "GPU", "GPU-shared"]},
+            *set_bundles(["RM"]),
         ],
         "environments.umich.GreatLakesEnvironment": [
-            {
-                "partition": ["standard", "gpu", "gpu_mig40"],
-            },
-            DEFAULT_SETTING,
+            {"partition": ["standard", "gpu", "gpu_mig40"]},
+            *set_bundles(),
         ],
-        "environments.incite.SummitEnvironment": [{}, DEFAULT_SETTING],
+        "environments.incite.SummitEnvironment": [{}, *set_bundles()],
         "environments.incite.AndesEnvironment": [
             {"partition": ["batch", "gpu"]},
-            {"partition": ["batch"], **DEFAULT_SETTING},
+            *set_bundles(["batch"]),
         ],
-        "environments.umn.MangiEnvironment": [{}, DEFAULT_SETTING],
+        "environments.umn.MangiEnvironment": [{}, *set_bundles()],
         "environments.xsede.ExpanseEnvironment": [
             {
                 "partition": ["compute", "shared", "gpu", "gpu-shared", "large-shared"],
             },
-            {"partition": ["compute"], **DEFAULT_SETTING},
+            *set_bundles(["compute"]),
         ],
         "environments.drexel.PicotteEnvironment": [
-            {
-                "partition": ["def", "gpu"],
-            },
-            {"partition": ["def"], **DEFAULT_SETTING},
+            {"partition": ["def", "gpu"]},
+            *set_bundles(["def"]),
         ],
         "environments.xsede.DeltaEnvironment": [
-            {
-                "partition": ["cpu", "gpuA40x4", "gpuA100x4"],
-            },
-            {"partition": ["cpu"], **DEFAULT_SETTING},
+            {"partition": ["cpu", "gpuA40x4", "gpuA100x4"]},
+            *set_bundles(["cpu"]),
         ],
-        "environments.incite.CrusherEnvironment": [{}, DEFAULT_SETTING],
+        "environments.incite.CrusherEnvironment": [{}, *set_bundles()],
         # Frontier cannot use partitions as logic requires gpu
         # in the name of partitions that are gpu nodes.
-        "environments.incite.FrontierEnvironment": [{}, DEFAULT_SETTING],
+        "environments.incite.FrontierEnvironment": [{}, *set_bundles()],
         "environments.purdue.AnvilEnvironment": [
             {
                 "partition": [
@@ -122,7 +119,7 @@ def init(project):
                     "gpu",
                 ],
             },
-            {"partition": ["wholenode"], **DEFAULT_SETTING},
+            *set_bundles(["wholenode"]),
         ],
     }