add parameter conditions #215

Author: JavierCladellas

config/toolbox_heat/heat_plots.json

@@ -13,7 +13,7 @@
             ],
             "names": [ ],
             "xaxis": {
-                "parameter": "meshes",
+                "parameter": "mesh",
                 "label": "mesh levels"
             },
             "yaxis": {
@@ -28,7 +28,7 @@
                 "label": "Measures"
             },
             "aggregations":[
-                {"column":"nb_tasks.tasks","agg":"filter:128"}
+                {"column":"nb_tasks.tasks","agg":"filter:640"}
             ]
         },
         {
@@ -46,7 +46,7 @@
                 "label": "Number of tasks"
             },
             "secondary_axis": {
-                "parameter": "meshes",
+                "parameter": "mesh",
                 "label": "Mesh level"
             },
             "yaxis": {
@@ -75,7 +75,7 @@
                 "label": "Number of tasks"
             },
             "secondary_axis": {
-                "parameter": "meshes",
+                "parameter": "mesh",
                 "label": "Mesh level"
             },
             "yaxis": {
@@ -104,7 +104,7 @@
                 "label": "Number of tasks"
             },
             "secondary_axis": {
-                "parameter": "meshes",
+                "parameter": "mesh",
                 "label": "Mesh level"
             },
             "yaxis": {
@@ -133,7 +133,7 @@
                 "label": "Number of tasks"
             },
             "secondary_axis": {
-                "parameter": "meshes",
+                "parameter": "mesh",
                 "label": "Mesh level"
             },
             "yaxis": {
@@ -146,6 +146,64 @@
             "aggregations":[
                 {"column":"discretization","agg":"filter:P2"}
             ]
+        },
+        {
+            "title": "Performance (P3)",
+            "plot_types": [ "stacked_bar", "grouped_bar" ],
+            "transformation": "performance",
+            "variables": [
+                "Constructor_init",
+                "Solve_algebraic-assembly",
+                "PostProcessing_exportResults"
+            ],
+            "names": [ ],
+            "xaxis": {
+                "parameter": "nb_tasks.tasks",
+                "label": "Number of tasks"
+            },
+            "secondary_axis": {
+                "parameter": "mesh",
+                "label": "Mesh level"
+            },
+            "yaxis": {
+                "label": "execution time (s)"
+            },
+            "color_axis":{
+                "parameter":"performance_variable",
+                "label":"Performance variable"
+            },
+            "aggregations":[
+                {"column":"discretization","agg":"filter:P3"}
+            ]
+        },
+        {
+            "title": "Speedup (P3)",
+            "plot_types": [ "scatter" ],
+            "transformation": "speedup",
+            "variables": [
+                "Constructor_init",
+                "Solve_algebraic-assembly",
+                "PostProcessing_exportResults"
+            ],
+            "names": [ ],
+            "xaxis": {
+                "parameter": "nb_tasks.tasks",
+                "label": "Number of tasks"
+            },
+            "secondary_axis": {
+                "parameter": "mesh",
+                "label": "Mesh level"
+            },
+            "yaxis": {
+                "label": "Speedup"
+            },
+            "color_axis":{
+                "parameter":"performance_variable",
+                "label":"Performance variable"
+            },
+            "aggregations":[
+                {"column":"discretization","agg":"filter:P3"}
+            ]
         }
     ]
 }

config/toolbox_heat/thermal_bridges_case_3.json

@@ -1,6 +1,6 @@
 {
     "executable": "feelpp_toolbox_heat",
-    "output_directory": "{{machine.output_app_dir}}/toolboxes/heat/ThermalBridgesENISO10211/Case3",
+    "output_directory": "{{machine.output_app_dir}}/javier_test/toolboxes/heat/ThermalBridgesENISO10211/Case3",
     "use_case_name": "ThermalBridgesENISO10211",
     "timeout":"0-00:10:00",
     "memory":"250G",
@@ -9,7 +9,7 @@
             "image": {
                 "name":"{{machine.containers.apptainer.image_base_dir}}/feelpp-noble.sif"
             },
-            "input_dir":"/input_data/",
+            "input_dir":"/input_data",
             "options": [
                 "--home {{machine.output_app_dir}}",
                 "--bind {{machine.input_dataset_base_dir}}/{{use_case_name}}/:{{platforms.apptainer.input_dir}}",
@@ -29,11 +29,8 @@
         "--heat.scalability-save=1",
         "--repository.append.np 0",
         "--case.discretization {{parameters.discretization.value}}",
-        "--heat.json.patch='{\"op\": \"replace\",\"path\": \"/Meshes/heat/Import/filename\",\"value\": \"{{platforms.{{machine.platform}}.input_dir}}/partitioning/case3/{{parameters.meshes.value}}/case3_p{{parameters.nb_tasks.tasks.value}}.json\" }'"
+        "--heat.json.patch='{\"op\": \"replace\",\"path\": \"/Meshes/heat/Import/filename\",\"value\": \"{{platforms.{{machine.platform}}.input_dir}}/partitioning/case3/{{parameters.mesh.value}}/case3_p{{parameters.nb_tasks.tasks.value}}.json\" }'"
     ],
-    "env_variables":{
-        "OMP_NUM_THREADS":"1"
-    },
     "outputs": [
         {
             "filepath": "{{output_directory}}/{{instance}}/{{use_case_name}}/heat.measures/values.csv",
@@ -70,17 +67,33 @@
     "parameters": [
         {
             "name": "nb_tasks",
-            "sequence": [
-                {"tasks":128,"tasks_per_node":128,"exclusive_access":true}
+            "zip":[
+                {
+                    "name":"tasks",
+                    "range":{ "min":128, "max":1280, "step":128}
+                },
+                {
+                    "name":"exclusive_access",
+                    "repeat":{"value":true,"count":10}
+                },
+                {
+                    "name":"tasks_per_node",
+                    "repeat":{"value":128,"count":10}
+                }
             ]
         },
         {
-            "name": "meshes",
-            "sequence": ["M1"]
+            "name":"mesh",
+            "sequence":["M1","M2","M3"]
         },
         {
-            "name": "discretization",
-            "sequence": ["P1"]
+            "name":"discretization",
+            "sequence":["P1","P2","P3"],
+            "conditions":{
+                "P1":{ "nb_tasks.tasks":[128, 256, 384, 512, 640, 768] },
+                "P2":{ "nb_tasks.tasks":[768, 896, 1024, 1152, 1280] },
+                "P3":{ "nb_tasks.tasks":[640, 768, 896, 1024, 1152, 1280] }
+            }
         },
         {
             "name": "solver",

src/feelpp/benchmarking/reframe/config/configParameters.py

@@ -66,6 +66,8 @@ class Parameter(BaseModel):
     mode:str = None
     active:Optional[bool] = True
 
+    conditions: Optional[dict[str,dict[str,List]]] = {}
+
     linspace:Optional[Linspace] = None
     geomspace:Optional[Geomspace] = None
     range:Optional[Range] = None

src/feelpp/benchmarking/reframe/setup.py

@@ -180,6 +180,19 @@ class ReframeSetup(rfm.RunOnlyRegressionTest):
             param_values = list(ParameterFactory.create(param_config).parametrize())
             exec(f"{param_config.name}=parameter({param_values})")
 
+    @run_after('init')
+    def pruneParameterSpace(self):
+        for param_config in self.app_setup.reader.config.parameters:
+            for current_param_value, filters in param_config.conditions.items():
+                if getattr(self,param_config.name) == current_param_value:
+                    for accept_name,accept_values in filters.items():
+                        param_path = accept_name.split(".")
+                        current_filter_value = getattr(self,param_path[0])
+                        if len(param_path) > 1:
+                            for p in param_path[1:]:
+                                current_filter_value = current_filter_value[p]
+                        self.skip_if( current_filter_value not in accept_values,  f"{accept_name}={current_filter_value} not in {param_config.name}={current_param_value} condition list ({accept_values})", )
+
     @run_after('init')
     def setupAfterInit(self):
         """ Sets the necessary post-init configurations"""