made scalability directory optional

Author: JavierCladellas

src/feelpp/benchmarking/reframe/regression.py

@@ -18,7 +18,7 @@ class RegressionTest(ReframeSetup):
     def initHandlers(self):
         self.validation_handler = ValidationHandler(self.app_reader.config.sanity)
         if self.app_reader.config.scalability:
-            self.scalability_handler = ScalabilityHandler(self.app_reader.config.scalability)
+            self.scalability_handler = ScalabilityHandler(self.app_reader.config.scalability, os.path.join(self.stagedir,self.stdout.evaluate()))
         else:
             self.scalability_handler = None
 
@@ -84,7 +84,7 @@ def setPerfVars(self):
 
     @run_before("cleanup")
     def removeDirectories(self):
-        if self.app_reader.config.scalability and self.app_reader.config.scalability.clean_directory:
+        if self.app_reader.config.scalability and self.app_reader.config.scalability.clean_directory and self.app_reader.config.scalability.directory:
             FileHandler.cleanupDirectory(self.app_reader.config.scalability.directory)
         if self.machine_reader.config.input_user_dir and self.app_reader.config.input_file_dependencies:
             DEBUG("REMOVING INPUT FILE DEPENDENCIES...")

src/feelpp/benchmarking/reframe/scalability.py

@@ -156,8 +156,12 @@ def _extractVariables(self):
 class ExtractorFactory:
     """Factory class for extractor strategies"""
     @staticmethod
-    def create(stage,directory,index=None):
-        filepath = os.path.join(directory,stage.filepath)
+    def create(stage,directory,index=None, stdout = None):
+        if stage.filepath == "stdout":
+            filepath = stdout
+        else:
+            filepath = os.path.join(directory,stage.filepath)
+
         if stage.format == "csv":
             return CsvExtractor(filepath=filepath, stage_name = stage.name, units=stage.units)
         elif stage.format == "tsv":
@@ -172,10 +176,11 @@ def create(stage,directory,index=None):
 
 class ScalabilityHandler:
     """ Class to handle scalability related attributes"""
-    def __init__(self,scalability_config):
+    def __init__(self,scalability_config, stdout = None):
         self.directory = scalability_config.directory
         self.stages =  scalability_config.stages
         self.custom_variables = scalability_config.custom_variables
+        self.stdout = stdout
 
     def getPerformanceVariables(self,index=None):
         """ Opens and parses the performance variable values depending on the config setup.
@@ -185,7 +190,7 @@ def getPerformanceVariables(self,index=None):
         """
         perf_variables = {}
         for stage in self.stages:
-            extractor = ExtractorFactory.create(stage,self.directory,index)
+            extractor = ExtractorFactory.create(stage,self.directory,index, self.stdout)
             perf_variables.update( extractor.extract() )
 
         return perf_variables

src/feelpp/benchmarking/reframe/schemas/scalability.py

@@ -49,7 +49,17 @@ class CustomVariable(BaseModel):
     unit: str
 
 class Scalability(BaseModel):
-    directory: str
+    directory: Optional[str] = None
     stages: List[Stage]
     custom_variables:Optional[List[CustomVariable]] = []
     clean_directory: Optional[bool] = False
+
+    @model_validator(mode = "after")
+    def checkOptionalDirectory(self):
+        if self.directory is None:
+            #Directory should be specified if any stage has filename other than stdout
+            for stage in self.stages:
+                if stage.filepath != "stdout":
+                    raise ValueError("Directory should be specified for non-stdout output files")
+
+        return self

src/feelpp/benchmarking/reframe/setup.py

@@ -161,7 +161,7 @@ def setResources(self):
 
     @run_before('run')
     def cleanupDirectories(self):
-        if self.app_reader.config.scalability:
+        if self.app_reader.config.scalability and self.app_reader.config.scalability.directory:
             FileHandler.cleanupDirectory(self.app_reader.config.scalability.directory)
 
     @run_before('run')