rm old memory field

Author: JavierCladellas

config/toolbox_heat/thermal_bridges_case_3.json

@@ -3,7 +3,6 @@
     "output_directory": "{{machine.output_app_dir}}/javier_test/toolboxes/heat/ThermalBridgesENISO10211/Case3",
     "use_case_name": "ThermalBridgesENISO10211",
     "timeout":"0-00:10:00",
-    "memory":"250G",
     "resources":{
         "tasks":"{{parameters.resources.tasks.value}}",
         "tasks_per_node":"{{parameters.resources.tasks_per_node.value}}",
@@ -76,15 +75,15 @@
             "zip":[
                 {
                     "name":"tasks",
-                    "range":{ "min":128, "max":384, "step":128}
+                    "range":{ "min":128, "max":256, "step":128}
                 },
                 {
                     "name":"tasks_per_node",
-                    "repeat":{"value":128,"count":3}
+                    "repeat":{"value":128,"count":2}
                 },
                 {
                     "name":"exclusive_access",
-                    "repeat":{"value":true,"count":3}
+                    "repeat":{"value":true,"count":2}
                 }
             ]
         },

src/feelpp/benchmarking/reframe/__main__.py

@@ -43,7 +43,7 @@ def main_cli():
         app_reader.updateConfig(machine_reader.processor.flattenDict(machine_reader.config,"machine"))
         app_reader.updateConfig() #Update with own field
 
-        reframe_cmd = cmd_builder.buildCommand( app_reader.config.timeout, app_reader.config.memory)
+        reframe_cmd = cmd_builder.buildCommand( app_reader.config.timeout)
 
         exit_code = subprocess.run(reframe_cmd, shell=True)
 

src/feelpp/benchmarking/reframe/commandBuilder.py

@@ -37,17 +37,15 @@ def buildExecutionMode(self):
         else:
             return "-r"
 
-    def buildJobOptions(self,timeout,memory):
+    def buildJobOptions(self,timeout):
         #TODO: Generalize (only workf for slurm ?)
         options = []
         if timeout:
             options.append(f"-J time={timeout}")
-        if memory:
-            options.append(f"-J mem={memory}")
         return " ".join(options)
 
 
-    def buildCommand(self,timeout,memory):
+    def buildCommand(self,timeout):
         assert self.report_folder_path is not None, "Report folder path not set"
         cmd = [
             'reframe',
@@ -58,7 +56,7 @@ def buildCommand(self,timeout,memory):
             f'--exec-policy={self.machine_config.execution_policy}',
             f'--prefix={self.machine_config.reframe_base_dir}',
             f'--report-file={str(os.path.join(self.report_folder_path,"reframe_report.json"))}',
-            f"{self.buildJobOptions(timeout,memory)}",
+            f"{self.buildJobOptions(timeout)}",
             f'--perflogdir={os.path.join(self.machine_config.reframe_base_dir,"logs")}',
             f'{"-"+"v"*self.parser.args.verbose  if self.parser.args.verbose else ""}',
             f'{self.buildExecutionMode()}'

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

@@ -101,7 +101,6 @@ def validateResources(self):
 class ConfigFile(BaseModel):
     executable: str
     timeout: str
-    memory: Optional[str] = None
     resources: Resources
     platforms:Optional[Dict[str,Platform]] = {"builtin":Platform()}
     output_directory:Optional[str] = ""

tests/configtest/test_commandBuilder.py

@@ -112,7 +112,6 @@ def test_buildExecutionMode(self,cmd_builder,parser):
     def test_buildCommand(self,cmd_builder,machine_config,parser):
         """Tests the buildCommand method of the CommandBuilder"""
         timeout = "0-00:01:00"
-        memory = "250G"
         executable ="test_executable"
         use_case ="test_use_case"
 
@@ -129,10 +128,9 @@ def test_buildCommand(self,cmd_builder,machine_config,parser):
             f"--prefix={machine_config.reframe_base_dir} "
             f"--report-file={str(os.path.join(report_folder_path,'reframe_report.json'))} "
             f"-J time={timeout} "
-            f"-J mem={memory} "
             f"--perflogdir={os.path.join(machine_config.reframe_base_dir,'logs')} "
         )
         expected_command += "-" + "v"*parser.args.verbose if parser.args.verbose else ""
         expected_command += " --dry-run" if parser.args.dry_run else " -r"
 
-        assert expected_command == cmd_builder.buildCommand(timeout,memory)
+        assert expected_command == cmd_builder.buildCommand(timeout)