diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f59375d8ee3c245e7d8008e7e8c6d6ff13b3d96..d3989b65d2206d26aff9778582ef99014e45ce2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Changelog All notable changes to this project will be documented in this file. +## v1.2.1 - 2021-02-08 - bug fix for recursive import error + +### general: + +* applied bug fix + +### technical: + +* bug fix for recursive import error, #269 + ## v1.2.0 - 2020-12-18 - parallel preprocessing and improved data handlers ### general: diff --git a/README.md b/README.md index c48b7cdb44b6f98a6a1f12a81c0a4717cc1e0d41..ba904e9efb2418a27b2810b762692538ddc956f3 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ HPC systems, see [here](#special-instructions-for-installation-on-jülich-hpc-sy * Installation of **MLAir**: * Either clone MLAir from the [gitlab repository](https://gitlab.version.fz-juelich.de/toar/mlair.git) and use it without installation (beside the requirements) - * or download the distribution file ([current version](https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-1.2.0-py3-none-any.whl)) + * or download the distribution file ([current version](https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-1.2.1-py3-none-any.whl)) and install it via `pip install <dist_file>.whl`. In this case, you can simply import MLAir in any python script inside your virtual environment using `import mlair`. * (tf) Currently, TensorFlow-1.13 is mentioned in the requirements. We already tested the TensorFlow-1.15 version and couldn't diff --git a/dist/mlair-1.2.1-py3-none-any.whl b/dist/mlair-1.2.1-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..686330f087aed80c9d9e86d77332a8c8ae1f96d3 Binary files /dev/null and b/dist/mlair-1.2.1-py3-none-any.whl differ diff --git a/docs/_source/get-started.rst b/docs/_source/get-started.rst index ede3cebfb7e1d9f673da3751c0cc2ab4dfba12ea..880a400b28a74529dbf3af53485b75b4169dc511 100644 --- a/docs/_source/get-started.rst +++ b/docs/_source/get-started.rst @@ -31,7 +31,7 @@ Installation of MLAir * Install all requirements from `requirements.txt <https://gitlab.version.fz-juelich.de/toar/machinelearningtools/-/blob/master/requirements.txt>`_ preferably in a virtual environment * Either clone MLAir from the `gitlab repository <https://gitlab.version.fz-juelich.de/toar/machinelearningtools.git>`_ -* or download the distribution file (`current version <https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-1.2.0-py3-none-any.whl>`_) +* or download the distribution file (`current version <https://gitlab.version.fz-juelich.de/toar/mlair/-/blob/master/dist/mlair-1.2.1-py3-none-any.whl>`_) and install it via :py:`pip install <dist_file>.whl`. In this case, you can simply import MLAir in any python script inside your virtual environment using :py:`import mlair`. * (tf) Currently, TensorFlow-1.13 is mentioned in the requirements. We already tested the TensorFlow-1.15 version and couldn't diff --git a/mlair/__init__.py b/mlair/__init__.py index e9a157ca5bba11b22e80df0f3f18092fb0f32db6..e8ad9509e3fb90826c862d1a17641df071168b18 100644 --- a/mlair/__init__.py +++ b/mlair/__init__.py @@ -1,7 +1,7 @@ __version_info__ = { 'major': 1, 'minor': 2, - 'micro': 0, + 'micro': 1, } from mlair.run_modules import RunEnvironment, ExperimentSetup, PreProcessing, ModelSetup, Training, PostProcessing diff --git a/mlair/plotting/training_monitoring.py b/mlair/plotting/training_monitoring.py index 913c11dd8a4e0d23c2bde6864c12f17c65922644..09f49c848675eb21bd172e40b09b265e47c443fb 100644 --- a/mlair/plotting/training_monitoring.py +++ b/mlair/plotting/training_monitoring.py @@ -12,7 +12,7 @@ import pandas as pd from mlair.model_modules.keras_extensions import LearningRateDecay -matplotlib.use('Agg') +# matplotlib.use('Agg') history_object = Union[Dict, keras.callbacks.History] lr_object = Union[Dict, LearningRateDecay]