Requested renaming + small fix to existing plugins

Author: mhkarsten

examples/energibridge-profiling/RunnerConfig.py

@@ -85,7 +85,7 @@ def start_run(self, context: RunnerContext) -> None:
 
     def start_measurement(self, context: RunnerContext) -> None:
         """Perform any activity required for starting measurements."""
-        sampling_interval = context.run_variation['sampling']
+        sampling_interval = context.execute_run['sampling']
 
         profiler_cmd = f'sudo energibridge \
                         --interval {sampling_interval} \

examples/hello-world-fibonacci/RunnerConfig.py

@@ -58,7 +58,7 @@ def create_run_table_model(self) -> RunTableModel:
         factor2 = FactorModel("problem_size", [10, 20, 30])
         self.run_table_model = RunTableModel(
             factors=[factor1, factor2],
-            exclude_variations=[
+            exclude_combinations=[
                 {factor2: [10]},                    # all runs having treatment "10" will be excluded
                 {factor1: ['iter'], factor2: [30]}, # all runs having the combination ("iter", 30) will be excluded
             ],
@@ -85,9 +85,9 @@ def start_run(self, context: RunnerContext) -> None:
 
     def start_measurement(self, context: RunnerContext) -> None:
         """Perform any activity required for starting measurements."""
-        fib_type = context.run_variation["fib_type"]
-        problem_size = context.run_variation["problem_size"]
-
+        fib_type = context.execute_run["fib_type"]
+        problem_size = context.execute_run["problem_size"]
+        
         self.profiler = EnergiBridge(target_program=f"python examples/hello-world-fibonacci/fibonacci_{fib_type}.py {problem_size}",
                                      out_file=context.run_dir / "energibridge.csv")
 

examples/hello-world/RunnerConfig.py

@@ -57,7 +57,7 @@ def create_run_table_model(self) -> RunTableModel:
         factor2 = FactorModel("example_factor2", [True, False])
         self.run_table_model = RunTableModel(
             factors=[factor1, factor2],
-            exclude_variations=[
+            exclude_combinations=[
                 {factor1: ['example_treatment1']},                   # all runs having treatment "example_treatment1" will be excluded
                 {factor1: ['example_treatment2'], factor2: [True]},  # all runs having the combination ("example_treatment2", True) will be excluded
             ],

examples/linux-powerjoular-profiling/RunnerConfig.py

@@ -79,7 +79,7 @@ def start_run(self, context: RunnerContext) -> None:
         For example, starting the target system to measure.
         Activities after starting the run should also be performed here."""
 
-        cpu_limit = context.run_variation['cpu_limit']
+        cpu_limit = context.execute_run['cpu_limit']
 
         # start the target
         self.target = subprocess.Popen(['python', './primer.py'],

examples/linux-ps-profiling/RunnerConfig.py

@@ -62,7 +62,7 @@ def create_run_table_model(self) -> RunTableModel:
         pin_core_factor  = FactorModel("pin_core" , [True, False])
         self.run_table_model = RunTableModel(
             factors = [cpu_limit_factor, pin_core_factor],
-            exclude_variations = [
+            exclude_combinations = [
                 {cpu_limit_factor: [70], pin_core_factor: [False]} # all runs having the combination <'70', 'False'> will be excluded
             ],
             data_columns=["avg_cpu", "avg_mem"]
@@ -86,8 +86,8 @@ def start_run(self, context: RunnerContext) -> None:
         For example, starting the target system to measure.
         Activities after starting the run should also be performed here."""
 
-        cpu_limit = context.run_variation['cpu_limit']
-        pin_core  = context.run_variation['pin_core']
+        cpu_limit = context.execute_run['cpu_limit']
+        pin_core  = context.execute_run['pin_core']
 
         # start the target
         self.target = subprocess.Popen(['./primer'],

examples/picocm3-profiling/RunnerConfig.py

@@ -92,8 +92,8 @@ def start_run(self, context: RunnerContext) -> None:
         For example, starting the target system to measure.
         Activities after starting the run should also be performed here."""
 
-        num_workers = context.run_variation['num_workers']
-        write_size = context.run_variation['write_size']
+        num_workers = context.execute_run['num_workers']
+        write_size = context.execute_run['write_size']
 
         # Start stress-ng
         stress_cmd = f"sudo stress-ng \

experiment-runner/ConfigValidator/Config/Models/RunTableModel.py

@@ -11,13 +11,13 @@
 class RunTableModel:
     def __init__(self,
                  factors: List[FactorModel],
-                 exclude_variations: List[Dict[FactorModel, List[SupportsStr]]] = None,
+                 exclude_combinations: List[Dict[FactorModel, List[SupportsStr]]] = None,
                  repetitions: int = 1,
                  data_columns: List[str] = None,
                  shuffle: bool = False
                  ):
-        if exclude_variations is None:
-            exclude_variations = {}
+        if exclude_combinations is None:
+            exclude_combinations = {}
         if data_columns is None:
             data_columns = []
 
@@ -31,7 +31,7 @@ def __init__(self,
             raise BaseError("Duplicate data column detected!")
 
         self.__factors = factors
-        self.__exclude_variations = exclude_variations
+        self.__exclude_combinations = exclude_combinations
         self.__repetitions = repetitions
         self.__data_columns = data_columns
         self.__shuffle = shuffle
@@ -44,11 +44,11 @@ def get_data_columns(self) -> List[str]:
 
     def generate_experiment_run_table(self) -> List[Dict]:
         def __filter_list(full_list: List[Tuple]):
-            if len(self.__exclude_variations) == 0:
+            if len(self.__exclude_combinations) == 0:
                 return full_list
 
             to_remove_indices = []
-            for exclusion in self.__exclude_variations:
+            for exclusion in self.__exclude_combinations:
                 # Construct the exclusion tuples
                 list_of_lists = []
                 indexes = []

experiment-runner/ConfigValidator/Config/Models/RunnerContext.py

@@ -3,7 +3,7 @@
 
 class RunnerContext:
 
-    def __init__(self, run_variation: dict, run_nr: int, run_dir: Path):
-        self.run_variation = run_variation
+    def __init__(self, execute_run: dict, run_nr: int, run_dir: Path):
+        self.execute_run = execute_run
         self.run_nr = run_nr
         self.run_dir = run_dir

experiment-runner/ConfigValidator/Config/RunnerConfig.py

@@ -58,7 +58,7 @@ def create_run_table_model(self) -> RunTableModel:
         factor2 = FactorModel("example_factor2", [True, False])
         self.run_table_model = RunTableModel(
             factors=[factor1, factor2],
-            exclude_variations=[
+            exclude_combinations=[
                 {factor1: ['example_treatment1']},                   # all runs having treatment "example_treatment1" will be excluded
                 {factor1: ['example_treatment2'], factor2: [True]},  # all runs having the combination ("example_treatment2", True) will be excluded
             ],

experiment-runner/ExperimentOrchestrator/Experiment/ExperimentController.py

@@ -56,7 +56,7 @@ def __init__(self, config: RunnerConfig, metadata: Metadata):
             existing_run_table = self.csv_data_manager.read_run_table()
 
             # First sanity check. If there is no "TODO" in the __done column, simply abort.
-            todo_run_found = any([variation['__done'] != RunProgress.DONE for variation in existing_run_table])
+            todo_run_found = any([current_run['__done'] != RunProgress.DONE for current_run in existing_run_table])
             if not todo_run_found:
                 raise BaseError("The experiment was restarted, but all runs have already been completed.")
 
@@ -125,14 +125,14 @@ def do_experiment(self):
         EventSubscriptionController.raise_event(RunnerEvents.BEFORE_EXPERIMENT)
 
         # -- Experiment
-        for variation in self.run_table:
-            if variation['__done'] == RunProgress.DONE:
+        for current_run in self.run_table:
+            if current_run['__done'] == RunProgress.DONE:
                 continue
 
             output.console_log_WARNING("Calling before_run config hook")
             EventSubscriptionController.raise_event(RunnerEvents.BEFORE_RUN)
 
-            run_controller = RunController(variation, self.config, (self.run_table.index(variation) + 1), len(self.run_table))
+            run_controller = RunController(current_run, self.config, (self.run_table.index(current_run) + 1), len(self.run_table))
             perform_run = multiprocessing.Process(
                 target=run_controller.do_run,
                 args=[]