Implement appending to PATH without needing changes to ramble, through existing interface

Author: Michael Richard Mckinsey

experiments/osu-micro-benchmarks/experiment.py

@@ -110,8 +110,6 @@ def compute_applications_section(self):
             for pk, pv in num_nodes.items():
                 self.add_experiment_variable("n_gpus", pv, True)
 
-        self.add_experiment_variable("binary_path", [p for p in self.spec.variants["env_modules_path"]], False)
-
     def compute_spack_section(self):
         system_specs = {}
         if self.spec.satisfies("+cuda"):

lib/benchpark/experiment.py

@@ -25,6 +25,11 @@
 class ExperimentHelper:
     def __init__(self, exp):
         self.spec = exp.spec
+        self.variables = {}
+        self.env_vars = {
+            "set": {},
+            "append": {},
+        }
 
     def compute_include_section(self):
         return []
@@ -47,6 +52,19 @@ def get_helper_name_prefix(self):
     def get_spack_variants(self):
         return None
 
+    def set_environment_variable(self, name, value):
+        self.env_vars["set"][name] = value
+
+    def append_environment_variable(self, name, value):
+        self.env_vars["append"][name] = value
+
+    def compute_config_variables(self):
+        pass
+
+    def compute_config_variables_wrapper(self):
+        self.compute_config_variables()
+        return self.variables, self.env_vars
+
 
 class SingleNode:
     variant(
@@ -102,9 +120,9 @@ class Experiment(ExperimentSystemBase, SingleNode):
     )
 
     variant(
-        "env_modules_path",
+        "append_path",
         default=" ",
-        description="path to local package to use as environment module",
+        description="Append to environment PATH during experiment execution",
     )
 
     def __init__(self, spec):
@@ -163,7 +181,10 @@ def add_experiment_variable(self, name, values, use_in_expr_name=False):
             self.expr_name.append(f"{{{name}}}")
 
     def set_environment_variable(self, name, values):
-        self.set_env_vars[name] = values
+        self.env_vars["set"][name] = values
+
+    def append_environment_variable(self, name, values):
+        self.env_vars["append"][0]["paths"][name] = values
 
     def zip_experiment_variables(self, name, variable_names):
         self.zips[name] = list(variable_names)
@@ -186,12 +207,25 @@ def compute_applications_section(self):
 
     def compute_applications_section_wrapper(self):
         self.expr_name = []
-        self.set_env_vars = {}
+        self.env_vars = {
+            "set": {},
+            "append": [
+                {
+                    "paths": {},
+                }
+            ],
+        }
         self.variables = {}
         self.zips = {}
         self.matrix = []
         self.excludes = []
 
+        for cls in self.helpers:
+            variables, env_vars = cls.compute_config_variables_wrapper()
+            self.variables |= variables
+            self.env_vars["set"] |= env_vars["set"]
+            self.env_vars["append"][0] |= env_vars["append"]
+
         self.compute_applications_section()
 
         expr_helper_list = []
@@ -203,6 +237,7 @@ def compute_applications_section_wrapper(self):
 
         expr_setup = {
             "variants": {"package_manager": self.spec.variants["package_manager"][0]},
+            "env_vars": self.env_vars,
             "variables": self.variables,
             "zips": self.zips,
             "matrix": self.matrix,
@@ -275,11 +310,9 @@ def compute_environment_modules_section(self):
 
         self.compute_spack_section()
 
-        if "env_modules_path" in self.spec.variants:
-            self.add_experiment_variable(
-                "binary_path",
-                [p for p in self.spec.variants["env_modules_path"]],
-                False,
+        if "append_path" in self.spec.variants:
+            self.append_environment_variable(
+                "PATH", self.spec.variants["append_path"][0]
             )
 
         return {