From 37abd13430f9c24362b2869a654b85cc13390004 Mon Sep 17 00:00:00 2001 From: Tim-Oliver Buchholz Date: Thu, 2 Sep 2021 13:41:43 +0200 Subject: [PATCH 1/4] Fix callback import. --- n2v/models/n2v_standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/n2v/models/n2v_standard.py b/n2v/models/n2v_standard.py index 4bd6ecc..dc4d2f9 100644 --- a/n2v/models/n2v_standard.py +++ b/n2v/models/n2v_standard.py @@ -304,7 +304,7 @@ def prepare_for_training(self, optimizer=None, **kwargs): TensorBoard(log_dir=str(self.logdir / 'logs'), write_graph=False, profile_batch=0)) if self.config.train_reduce_lr is not None: - from keras.callbacks import ReduceLROnPlateau + from tensorflow.keras.callbacks import ReduceLROnPlateau rlrop_params = self.config.train_reduce_lr if 'verbose' not in rlrop_params: rlrop_params['verbose'] = True From d51f78f151143851bc748374d8a8ef98fe038449 Mon Sep 17 00:00:00 2001 From: Tim-Oliver Buchholz Date: Thu, 2 Sep 2021 13:54:56 +0200 Subject: [PATCH 2/4] Bump version. --- n2v/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/n2v/version.py b/n2v/version.py index 0404d81..e1424ed 100644 --- a/n2v/version.py +++ b/n2v/version.py @@ -1 +1 @@ -__version__ = '0.3.0' +__version__ = '0.3.1' From 746c9dacfdb8d11ab1efb95613a01a26f95471c0 Mon Sep 17 00:00:00 2001 From: Tim-Oliver Buchholz Date: Mon, 6 Sep 2021 09:28:44 +0200 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f42daa..5945199 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,19 +7,15 @@ language: python -env: - - TENSORFLOW='tensorflow' KERAS='keras' - matrix: include: - os: linux dist: bionic python: 3.7 - env: TENSORFLOW='tensorflow==2.4.1' KERAS='keras==2.3.1' install: - - pip install $TENSORFLOW $KERAS + - pip install tensorflow - pip install . script: - - cd tests; pytest -v -s test*.py \ No newline at end of file + - cd tests; pytest -v -s test*.py From b0822c437f697490c8d3b0f7940133e7815fda2b Mon Sep 17 00:00:00 2001 From: Tim-Oliver Buchholz Date: Mon, 6 Sep 2021 09:57:36 +0200 Subject: [PATCH 4/4] Revert travis.yml --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ec8508..a90fbbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,14 +7,18 @@ language: python +env: + - TENSORFLOW='tensorflow' KERAS='keras' + matrix: include: - os: linux dist: bionic python: 3.7 + env: TENSORFLOW='tensorflow==2.4.1' KERAS='keras==2.3.1' install: - - pip install tensorflow + - pip install $TENSORFLOW $KERAS - pip install packaging==21.0 - pip install .