From 2f33d2a9fbc55994bc7b16c5c7f8e6e5661ee878 Mon Sep 17 00:00:00 2001
From: Falco Weichselbaum <f.weichselbaum@fz-juelich.de>
Date: Tue, 2 Nov 2021 16:18:30 +0100
Subject: [PATCH] Changed assertion comparisment containing old keras
declarations. Disabled testing '_compare_keras_optimizers' since it is
disabled
---
.../test_abstract_model_class.py | 34 ++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/test/test_model_modules/test_abstract_model_class.py b/test/test_model_modules/test_abstract_model_class.py
index 3a610b1b..2c22b391 100644
--- a/test/test_model_modules/test_abstract_model_class.py
+++ b/test/test_model_modules/test_abstract_model_class.py
@@ -1,4 +1,4 @@
-import tensorflow.keras as keras
+import keras
import pytest
from mlair import AbstractModelClass
@@ -145,33 +145,35 @@ class TestAbstractModelClass:
with pytest.raises(ValueError) as einfo:
amc.compile_options = {"optimizer": keras.optimizers.Adam()}
assert "Got different values or arguments for same argument: self.optimizer=<class" \
- " 'keras.optimizers.SGD'> and 'optimizer': <class 'keras.optimizers.Adam'>" in str(einfo.value)
+ " 'tensorflow.python.keras.optimizer_v2.gradient_descent.SGD'> and " \
+ "'optimizer': <class 'tensorflow.python.keras.optimizer_v2.adam.Adam'>" in str(einfo.value)
def test_compile_options_setter_as_mix_attr_dict_invalid_duplicates_same_optimizer_other_args(self, amc):
amc.optimizer = keras.optimizers.SGD(lr=0.1)
with pytest.raises(ValueError) as einfo:
amc.compile_options = {"optimizer": keras.optimizers.SGD(lr=0.001)}
assert "Got different values or arguments for same argument: self.optimizer=<class" \
- " 'keras.optimizers.SGD'> and 'optimizer': <class 'keras.optimizers.SGD'>" in str(einfo.value)
+ " 'tensorflow.python.keras.optimizer_v2.gradient_descent.SGD'> and " \
+ "'optimizer': <class 'tensorflow.python.keras.optimizer_v2.gradient_descent.SGD'>" in str(einfo.value)
def test_compile_options_setter_as_dict_invalid_keys(self, amc):
with pytest.raises(ValueError) as einfo:
amc.compile_options = {"optimizer": keras.optimizers.SGD(), "InvalidKeyword": [1, 2, 3]}
assert "Got invalid key for compile_options. dict_keys(['optimizer', 'InvalidKeyword'])" in str(einfo.value)
- def test_compare_keras_optimizers_equal(self, amc):
- assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(), keras.optimizers.SGD()) is True
-
- def test_compare_keras_optimizers_no_optimizer(self, amc):
- assert amc._AbstractModelClass__compare_keras_optimizers('NoOptimizer', keras.optimizers.SGD()) is False
-
- def test_compare_keras_optimizers_other_parameters_run_sess(self, amc):
- assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(lr=0.1),
- keras.optimizers.SGD(lr=0.01)) is False
-
- def test_compare_keras_optimizers_other_parameters_none_sess(self, amc):
- assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(decay=1),
- keras.optimizers.SGD(decay=0.01)) is False
+# def test_compare_keras_optimizers_equal(self, amc):
+# assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(), keras.optimizers.SGD()) is True
+#
+# def test_compare_keras_optimizers_no_optimizer(self, amc):
+# assert amc._AbstractModelClass__compare_keras_optimizers('NoOptimizer', keras.optimizers.SGD()) is False
+#
+# def test_compare_keras_optimizers_other_parameters_run_sess(self, amc):
+# assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(lr=0.1),
+# keras.optimizers.SGD(lr=0.01)) is False
+#
+# def test_compare_keras_optimizers_other_parameters_none_sess(self, amc):
+# assert amc._AbstractModelClass__compare_keras_optimizers(keras.optimizers.SGD(decay=1),
+# keras.optimizers.SGD(decay=0.01)) is False
def test_getattr(self, amc):
amc.model = keras.Model()
--
GitLab