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

Merge branch 'release_v1.2.1' into 'master'

Resolve "release v.1.2.1 (bugfix)"

Closes #270

See merge request toar/mlair!234
parents cf6bca9d c591aa03
No related branches found
No related tags found
7 merge requests!299Draft: Merge default data handler and preprocessing support parameter use_multiprocessing....,!284default data handler and preprocessing support parameter use_multiprocessing....,!283Merge latest develop into falcos issue,!282update changelog in develop,!259Draft: Resolve "WRF-Datahandler should inherit from SingleStationDatahandler",!234Resolve "release v.1.2.1 (bugfix)",!233Draft: Resolve "BUG: recursion errors"
Pipeline #61006 failed
# Changelog # Changelog
All notable changes to this project will be documented in this file. 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 ## v1.2.0 - 2020-12-18 - parallel preprocessing and improved data handlers
### general: ### general:
......
...@@ -29,7 +29,7 @@ HPC systems, see [here](#special-instructions-for-installation-on-jülich-hpc-sy ...@@ -29,7 +29,7 @@ HPC systems, see [here](#special-instructions-for-installation-on-jülich-hpc-sy
* Installation of **MLAir**: * Installation of **MLAir**:
* Either clone MLAir from the [gitlab repository](https://gitlab.version.fz-juelich.de/toar/mlair.git) * Either clone MLAir from the [gitlab repository](https://gitlab.version.fz-juelich.de/toar/mlair.git)
and use it without installation (beside the requirements) 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 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`. 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 * (tf) Currently, TensorFlow-1.13 is mentioned in the requirements. We already tested the TensorFlow-1.15 version and couldn't
......
File added
...@@ -31,7 +31,7 @@ Installation of MLAir ...@@ -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>`_ * Install all requirements from `requirements.txt <https://gitlab.version.fz-juelich.de/toar/machinelearningtools/-/blob/master/requirements.txt>`_
preferably in a virtual environment preferably in a virtual environment
* Either clone MLAir from the `gitlab repository <https://gitlab.version.fz-juelich.de/toar/machinelearningtools.git>`_ * 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 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`. 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 * (tf) Currently, TensorFlow-1.13 is mentioned in the requirements. We already tested the TensorFlow-1.15 version and couldn't
......
__version_info__ = { __version_info__ = {
'major': 1, 'major': 1,
'minor': 2, 'minor': 2,
'micro': 0, 'micro': 1,
} }
from mlair.run_modules import RunEnvironment, ExperimentSetup, PreProcessing, ModelSetup, Training, PostProcessing from mlair.run_modules import RunEnvironment, ExperimentSetup, PreProcessing, ModelSetup, Training, PostProcessing
......
...@@ -12,7 +12,7 @@ import pandas as pd ...@@ -12,7 +12,7 @@ import pandas as pd
from mlair.model_modules.keras_extensions import LearningRateDecay from mlair.model_modules.keras_extensions import LearningRateDecay
matplotlib.use('Agg') # matplotlib.use('Agg')
history_object = Union[Dict, keras.callbacks.History] history_object = Union[Dict, keras.callbacks.History]
lr_object = Union[Dict, LearningRateDecay] lr_object = Union[Dict, LearningRateDecay]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment