Skip to content
Snippets Groups Projects
Commit 50314156 authored by Falco Weichselbaum's avatar Falco Weichselbaum
Browse files

removed dask from requirements.txt since it does not load in GitLab. Removed...

removed dask from requirements.txt since it does not load in GitLab. Removed __init__.py in keras_legacy, because it was unnecessary and wrong. Changed string to rawstring in PyTestRegex() calls.
parent b9aef02d
Branches
Tags
4 merge requests!413update release branch,!412Resolve "release v2.0.0",!349trying a new requirements.txt list that was generated using pipreqs (an...,!335Resolve "upgrade code to TensorFlow V2"
Pipeline #82007 failed
""" the modules in this directory are TAKEN FROM Keras 2.2.0 """
from mlair.mlair.keras_legacy import interfaces
from mlair.mlair.keras_legacy import conv_utils
## this list was generated using pipreqs on mlair/ ## this list was generated using pipreqs on mlair/ directory
astropy==4.1 astropy==4.1
auto_mix_prep==0.2.0 auto_mix_prep==0.2.0
Cartopy==0.18.0 Cartopy==0.18.0
...@@ -21,5 +21,3 @@ tensorflow==2.5.0 ...@@ -21,5 +21,3 @@ tensorflow==2.5.0
typing_extensions==3.7.4.3 typing_extensions==3.7.4.3
wget==3.2 wget==3.2
xarray==0.16.2 xarray==0.16.2
dask
\ No newline at end of file
...@@ -284,7 +284,7 @@ class TestLogger: ...@@ -284,7 +284,7 @@ class TestLogger:
def test_setup_logging_path_given(self, mock_makedirs): def test_setup_logging_path_given(self, mock_makedirs):
path = "my/test/path" path = "my/test/path"
log_path = Logger.setup_logging_path(path) log_path = Logger.setup_logging_path(path)
assert PyTestRegex("my/test/path/logging_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}\.log") == log_path assert PyTestRegex(r"my/test/path/logging_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}\.log") == log_path
def test_logger_console_level0(self, logger): def test_logger_console_level0(self, logger):
consol = logger.logger_console(0) consol = logger.logger_console(0)
......
...@@ -226,7 +226,7 @@ class TestInceptionModelBase: ...@@ -226,7 +226,7 @@ class TestInceptionModelBase:
assert self.step_in(block_pool2._keras_history[0], depth=3).name == 'Block_1d_Pad' assert self.step_in(block_pool2._keras_history[0], depth=3).name == 'Block_1d_Pad'
assert isinstance(self.step_in(block_pool2._keras_history[0], depth=3), ReflectionPadding2D) assert isinstance(self.step_in(block_pool2._keras_history[0], depth=3), ReflectionPadding2D)
# check naming of concat layer # check naming of concat layer
assert block.name == PyTestRegex('Block_1_Co(_\d*)?/concat:0') assert block.name == PyTestRegex(r'Block_1_Co(_\d*)?/concat:0')
assert block._keras_history[0].name == 'Block_1_Co' assert block._keras_history[0].name == 'Block_1_Co'
assert isinstance(block._keras_history[0], keras.layers.merge.Concatenate) assert isinstance(block._keras_history[0], keras.layers.merge.Concatenate)
# next block # next block
......
...@@ -7,7 +7,7 @@ import shutil ...@@ -7,7 +7,7 @@ import shutil
import tensorflow.keras as keras import tensorflow.keras as keras
import mock import mock
import pytest import pytest
from keras.callbacks import History from tensorflow.keras.callbacks import History
from mlair.data_handler import DataCollection, KerasIterator, DefaultDataHandler from mlair.data_handler import DataCollection, KerasIterator, DefaultDataHandler
from mlair.helpers import PyTestRegex from mlair.helpers import PyTestRegex
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment