Merge branch 'master' into 181-handle-report-deployment

feelpp · Dec 13, 2024 · 236d194 · 236d194
2 parents 6b4247a + 6df3d44
commit 236d194
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/config/toolbox_heat/thermal_bridges_case_3.json b/config/toolbox_heat/thermal_bridges_case_3.json
@@ -30,6 +30,9 @@
         "--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\" }'"
     ],
+    "env_variables":{
+        "OMP_NUM_THREADS":1
+    },
     "outputs": [
         {
             "filepath": "{{output_directory}}/{{instance}}/{{use_case_name}}/heat.measures/values.csv",

diff --git a/src/feelpp/benchmarking/reframe/config/configSchemas.py b/src/feelpp/benchmarking/reframe/config/configSchemas.py
@@ -86,6 +86,7 @@ class ConfigFile(BaseModel):
     output_directory:Optional[str] = ""
     use_case_name: str
     options: List[str]
+    env_variables:Optional[Dict] = {}
     outputs: List[AppOutput]
     scalability: Scalability
     sanity: Sanity

diff --git a/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.py b/src/feelpp/benchmarking/reframe/config/machineConfigs/discoverer.py
@@ -13,11 +13,6 @@
                     'max_jobs': 8,
                     'access': ['--partition=cn --account=ehpc-dev-2024d05-047 --qos=ehpc-dev-2024d05-047'],
                     'environs': ['default'],
-                    'prepare_cmds': [
-                        'source /etc/profile.d/modules.sh',
-                        'export MODULEPATH=/opt/software/modulefiles',
-                        'export OMP_NUM_THREADS=1' # Just in case
-                    ],
                     'processor': {
                         'num_cpus': 128
                     },

diff --git a/src/feelpp/benchmarking/reframe/setup.py b/src/feelpp/benchmarking/reframe/setup.py
@@ -133,7 +133,11 @@ def setupBeforeRun(self,rfm_test,machine_config):
         self.setExecutable(rfm_test,machine_config)
 
     def setupAfterInit(self, rfm_test):
-        pass
+        self.setEnvVariables()
+
+    def setEnvVariables(self):
+        for env_var_name,env_var_value in self.reader.config.env_variables.items():
+            os.environ[env_var_name] = env_var_value
 
     def cleanupDirectories(self):
         if os.path.exists(self.reader.config.scalability.directory):