Commit f1db077a authored by Maiterth, Matthias's avatar Maiterth, Matthias
Browse files

Merge branch 'fix-tests' into 'develop' 

Fix tests

See merge request exadigit/raps!105
parents 133ff957 bf3b6d23

raps/dataloaders/mit_supercloud/loader.py

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ def load_data(local_dataset_path, **kwargs): 
            time_limit=rec.get("time_limit", 0),

            start_time=t0 - start_ts,

            end_time=t1 - start_ts,

            wall_time=max(0, t1-t0),

            expected_run_time=max(0, t1-t0),

            trace_time=len(cpu_tr)*quanta,

            trace_start_time=0,

            trace_end_time=len(cpu_tr)*quanta,

raps/telemetry.py

+11 −12
Original line number Diff line number Diff line
@@ -70,10 +70,18 @@ class Telemetry: 
        self.system = kwargs.get('system')

        self.config = kwargs.get('config')

        outname = kwargs.get('output')

        if outname is None or outname == "":

        if outname:

            self.dirname = outname

        elif kwargs.get("replay"):

            # Try to extract date from given name to use as case directory

            matched_date = re.search(r"\d{4}-\d{2}-\d{2}", kwargs['replay'][0])

            if matched_date:

                self.dirname = f"sim={matched_date.group(0)}"

            else:

                self.dirname = create_casename()

        else:

            self.dirname = outname

            self.dirname = create_casename()



        try:

            self.dataloader = importlib.import_module(f"raps.dataloaders.{self.system}", package=__package__)

        except ImportError as e:
@@ -287,15 +295,6 @@ class Telemetry: 
                break



        if trigger_custom_dataloader:  # custom data loader

            # Try to extract date from given name to use as case directory

            matched_date = re.search(r"\d{4}-\d{2}-\d{2}", args.replay[0])

            if matched_date:

                extracted_date = matched_date.group(0)

                self.dirname = "sim=" + extracted_date

            else:

                extracted_date = f"Date not found, dirname is: {self.dirname}"

                print(extracted_date)



            print(*args.replay)

            try:

                jobs, timestep_start_from_data, timestep_end_from_data = self.load_data(args.replay)

tests/systems/test_main_basic_run.py

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ pytestmark = [ 
]





def test_main_run(system, system_config,random_id):

def test_main_basic_run(system, system_config,random_id):

    if not system_config.get("main", False):

        pytest.skip(f"{system} does not support basic main run.")

tests/systems/test_main_cooling_run.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pytestmark = [ 
]





def test_main_run(system, system_config, random_id):

def test_main_cooling_run(system, system_config, random_id):

    if not system_config.get("cooling", False):

        pytest.skip(f"{system} does not support cooling.")

tests/systems/test_main_cooling_uncertainty_run.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ pytestmark = [ 
]





def test_main_run(request, system, system_config, random_id):

def test_main_cooling_uncertainty_run(request, system, system_config, random_id):

    print(f"Markexpr: {request.config.option.markexpr}")

    if not system_config.get("uncertainty", False) or not system_config.get("cooling", False):

        pytest.skip(f"{system} does not support cooling or uncertainty.")