Skip to content
Snippets Groups Projects
Commit 7c8918ca authored by lukas leufen's avatar lukas leufen
Browse files

current status, not running!

parent ef4c57ed
Branches
Tags
2 merge requests!24include recent development,!20not distributed training
...@@ -5,15 +5,34 @@ import py ...@@ -5,15 +5,34 @@ import py
import pytest import pytest
@pytest.fixture(autouse=True, scope='class') @pytest.fixture(scope='class')
def teardown_module(pytestconfig): def teardown_module(pytestconfig):
yield yield
# dirname can be found at pytestconfig._assertstate.hook.session._initialparts[0][0].dirname but it is not clear for # dirname can be found at pytestconfig._assertstate.hook.session._initialparts[0][0].dirname but it is not clear for
# me, if there can be more than 1 entry in each of the lists. Therefore just loop over all elements will definitely # me, if there can be more than 1 entry in each of the lists. Therefore just loop over all elements will definitely
# catch all dirnames. # catch all dirnames.
d = pytestconfig._assertstate.hook.session._initialparts d = pytestconfig._assertstate.hook.session._initialparts
f = open("testfile.log", "a+")
print(f"pytestconfig._assertstate.hook.session._initialparts {pytestconfig._assertstate.hook.session._initialparts}")
print(f"pytestconfig._assertstate.hook.session._initialpaths {pytestconfig._assertstate.hook.session._initialpaths}")
f.write(f"pytestconfig._assertstate.hook.session._initialparts {pytestconfig._assertstate.hook.session._initialparts}\n")
f.write(f"pytestconfig._assertstate.hook.session._initialpaths {pytestconfig._assertstate.hook.session._initialpaths}\n")
f.write(f"pytestconfig.invocation_params.dir {pytestconfig.invocation_params.dir}\n")
f.write(f"pytestconfig.invocation_dir {pytestconfig.invocation_dir}\n")
f.write(f"list(pytestconfig._assertstate.hook.session._bestrelpathcache.keys())[0].dirname {list(pytestconfig._assertstate.hook.session._bestrelpathcache.keys())[0].dirname}\n")
f.write(f"list(pytestconfig._assertstate.hook.session._bestrelpathcache.keys())[0].strpath {list(pytestconfig._assertstate.hook.session._bestrelpathcache.keys())[0].strpath}\n")
for di in d: for di in d:
print(f"di: {type(di)}: {di}")
for dii in di: for dii in di:
print(f"dii: {type(dii)}: {dii}")
f.write(f"di: {type(di)}: {di}\n")
f.write(f"\tdii: {type(dii)}: {dii}\n")
if isinstance(dii, py._path.local.LocalPath): if isinstance(dii, py._path.local.LocalPath):
if "data" in os.listdir(dii.dirname): print("is localpath")
shutil.rmtree(os.path.join(dii.dirname, "data"), ignore_errors=True) f.write(f"\t\t{os.listdir(dii.strpath)}\n")
if "data" in os.listdir(dii.strpath):
print("found data")
f.write(f"\t\tfound data\n")
shutil.rmtree(os.path.join(dii.strpath, "data"), ignore_errors=True)
f.write("#############\n\n")
f.close()
from __future__ import generator_stop
import math import math
import keras import keras
...@@ -43,7 +44,7 @@ class Distributor(keras.utils.Sequence): ...@@ -43,7 +44,7 @@ class Distributor(keras.utils.Sequence):
if x is not None: if x is not None:
yield (x, y) yield (x, y)
if (k + 1) == len(self.generator) and curr == num_mini_batches and not fit_call: if (k + 1) == len(self.generator) and curr == num_mini_batches and not fit_call:
raise StopIteration return
def __len__(self): def __len__(self):
num_batch = 0 num_batch = 0
......
import math import math
import os import os
import shutil
import keras import keras
import numpy as np import numpy as np
......
import pytest import pytest
import os import os
import shutil
from src.data_handling.data_generator import DataGenerator from src.data_handling.data_generator import DataGenerator
class TestDataGenerator: class TestDataGenerator:
# @pytest.fixture(autouse=True, scope='module')
# def teardown_module(self):
# yield
# if "data" in os.listdir(os.path.dirname(__file__)):
# shutil.rmtree(os.path.join(os.path.dirname(__file__), "data"), ignore_errors=True)
@pytest.fixture @pytest.fixture
def gen(self): def gen(self):
return DataGenerator(os.path.join(os.path.dirname(__file__), 'data'), 'AIRBASE', 'DEBW107', ['o3', 'temp'], return DataGenerator(os.path.join(os.path.dirname(__file__), 'data'), 'AIRBASE', 'DEBW107', ['o3', 'temp'],
......
...@@ -44,7 +44,7 @@ class TestDataPrep: ...@@ -44,7 +44,7 @@ class TestDataPrep:
def test_set_file_name_and_meta(self): def test_set_file_name_and_meta(self):
d = object.__new__(DataPrep) d = object.__new__(DataPrep)
d.path = os.path.abspath('test/data/') d.path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "data")
d.station = 'TESTSTATION' d.station = 'TESTSTATION'
d.variables = ['a', 'bc'] d.variables = ['a', 'bc']
assert d._set_file_name() == os.path.join(os.path.abspath(os.path.dirname(__file__)), assert d._set_file_name() == os.path.join(os.path.abspath(os.path.dirname(__file__)),
......
...@@ -11,11 +11,6 @@ from src.modules.run_environment import RunEnvironment ...@@ -11,11 +11,6 @@ from src.modules.run_environment import RunEnvironment
class TestPreProcessing: class TestPreProcessing:
@pytest.fixture
def obj_no_init(self):
yield object.__new__(PreProcessing)
RunEnvironment().__del__()
@pytest.fixture @pytest.fixture
def obj_super_init(self): def obj_super_init(self):
obj = object.__new__(PreProcessing) obj = object.__new__(PreProcessing)
...@@ -96,9 +91,9 @@ class TestPreProcessing: ...@@ -96,9 +91,9 @@ class TestPreProcessing:
assert caplog.record_tuples[-1] == ('root', 20, PyTestRegex(r'run for \d+\.\d+s to check 6 station\(s\). Found ' assert caplog.record_tuples[-1] == ('root', 20, PyTestRegex(r'run for \d+\.\d+s to check 6 station\(s\). Found '
r'5/6 valid stations.')) r'5/6 valid stations.'))
def test_split_set_indices(self, obj_no_init): def test_split_set_indices(self, obj_super_init):
dummy_list = list(range(0, 15)) dummy_list = list(range(0, 15))
train, val, test = obj_no_init.split_set_indices(len(dummy_list), 0.9) train, val, test = obj_super_init.split_set_indices(len(dummy_list), 0.9)
assert dummy_list[train] == list(range(0, 10)) assert dummy_list[train] == list(range(0, 10))
assert dummy_list[val] == list(range(10, 13)) assert dummy_list[val] == list(range(10, 13))
assert dummy_list[test] == list(range(13, 15)) assert dummy_list[test] == list(range(13, 15))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment