Feature/single node check

experiments/amg2023/experiment.py

@@ -58,7 +58,6 @@ def compute_applications_section(self):
             "strong": self.spec.satisfies("+strong"),
             "weak": self.spec.satisfies("+weak"),
             "throughput": self.spec.satisfies("+throughput"),
-            "single_node": self.spec.satisfies("+single_node"),
         }
 
         scaling_mode_enabled = [key for key, value in scaling_modes.items() if value]

experiments/ior/experiment.py

@@ -32,7 +32,6 @@ def compute_applications_section(self):
         scaling_modes = {
             "strong": self.spec.satisfies("+strong"),
             "weak": self.spec.satisfies("+weak"),
-            "single_node": self.spec.satisfies("+single_node"),
         }
 
         scaling_mode_enabled = [key for key, value in scaling_modes.items() if value]

experiments/kripke/experiment.py

@@ -41,7 +41,6 @@ def compute_applications_section(self):
             "strong": self.spec.satisfies("+strong"),
             "weak": self.spec.satisfies("+weak"),
             "throughput": self.spec.satisfies("+throughput"),
-            "single_node": self.spec.satisfies("+single_node"),
         }
 
         scaling_mode_enabled = [key for key, value in scaling_modes.items() if value]

experiments/laghos/experiment.py

@@ -29,18 +29,6 @@ class Laghos(
     )
 
     def compute_applications_section(self):
-        # TODO: Replace with conflicts clause
-        scaling_modes = {
-            "strong": self.spec.satisfies("+strong"),
-            "single_node": self.spec.satisfies("+single_node"),
-        }
-
-        scaling_mode_enabled = [key for key, value in scaling_modes.items() if value]
-        if len(scaling_mode_enabled) != 1:
-            raise BenchparkError(
-                f"Only one type of scaling per experiment is allowed for application package {self.name}"
-            )
-
         # Number of initial nodes
         num_nodes = {"n_nodes": 1}
 

experiments/remhos/experiment.py

@@ -31,19 +31,6 @@ class Remhos(
     )
 
     def compute_applications_section(self):
-        # TODO: Replace with conflicts clause
-        scaling_modes = {
-            "strong": self.spec.satisfies("+strong"),
-            "single_node": self.spec.satisfies("+single_node"),
-        }
-
-        scaling_mode_enabled = [key for key, value in scaling_modes.items() if value]
-        if len(scaling_mode_enabled) != 1:
-            print(scaling_mode_enabled)
-            raise BenchparkError(
-                f"Only one type of scaling per experiment is allowed for application package {self.name}"
-            )
-
         # Number of initial nodes
         num_nodes = {"n_nodes": 1}
 

lib/benchpark/experiment.py

@@ -55,6 +55,9 @@ class SingleNode:
         description="Single node execution mode",
     )
 
+    def run_single_node_expr(self):
+        return 1 if self.spec.satisfies("+single_node") else 0
+
     class Helper(ExperimentHelper):
         def get_helper_name_prefix(self):
             return "single_node" if self.spec.satisfies("+single_node") else ""
@@ -172,6 +175,10 @@ def compute_applications_section_wrapper(self):
 
         self.compute_applications_section()
 
+        self.add_experiment_variable(
+            "run_single_node_expr", self.run_single_node_expr()
+        )
+
         expr_helper_list = []
         for cls in self.helpers:
             helper_prefix = cls.get_helper_name_prefix()

modifiers/allocation/modifier.py

@@ -37,6 +37,8 @@ class AllocOpt(Enum):
     POST_EXEC_CMDS = 302
     PRE_EXEC_CMDS = 303
 
+    RUN_SINGLE_NODE_EXPR = 666
+
     @staticmethod
     def as_type(enumval, input):
         if enumval in [
@@ -291,6 +293,12 @@ def determine_allocation(self, v):
                     )
             v.n_nodes = max(cores_node_request or 0, gpus_node_request or 0)
 
+        if v.run_single_node_expr and v.n_nodes > 1:
+            raise ValueError(
+                f"Experiment must run on 1 node. Requested {v.n_nodes} nodes"
+            )
+
+
         if not v.n_threads_per_proc:
             v.n_threads_per_proc = 1