diff --git a/HPC_setup/requirements_HDFML_additionals.txt b/HPC_setup/requirements_HDFML_additionals.txt index fd22a309913efa6478a4a00f94bac70433e21774..16dd2f681788695e6ed850e1f24b5e77e4e42656 100644 --- a/HPC_setup/requirements_HDFML_additionals.txt +++ b/HPC_setup/requirements_HDFML_additionals.txt @@ -10,16 +10,15 @@ cftime==1.4.1 chardet==4.0.0 coverage==5.4 cycler==0.10.0 -dask==2021.2.0 +dask==2.22.0 dill==0.3.3 fsspec==0.8.5 gast==0.4.0 -grpcio==1.35.0 -h5py==2.10.0 +grpcio==1.34.0 +h5py==3.1.0 idna==2.10 importlib-metadata==3.4.0 iniconfig==1.1.1 - kiwisolver==1.3.1 locket==0.2.1 Markdown==3.3.3 @@ -35,6 +34,7 @@ patsy==0.5.1 Pillow==8.1.0 pluggy==0.13.1 protobuf==3.15.0 +psutil==5.8.0 py==1.10.0 pydot==1.4.2 pyparsing==2.4.7 @@ -44,17 +44,18 @@ pytest-cov==2.11.1 pytest-html==3.1.1 pytest-lazy-fixture==0.6.3 pytest-metadata==1.11.0 -pytest-sugar +pytest-sugar==0.9.4 python-dateutil==2.8.1 pytz==2021.1 PyYAML==5.4.1 requests==2.25.1 -scipy==1.5.4 +scipy==1.5.2 seaborn==0.11.1 --no-binary shapely Shapely==1.7.0 six==1.15.0 statsmodels==0.12.2 tabulate==0.8.8 +tensorflow==2.5.0 termcolor==1.1.0 toml==0.10.2 toolz==0.11.1 @@ -64,3 +65,5 @@ Werkzeug==1.0.1 wget==3.2 xarray==0.16.2 zipp==3.4.0 + +#Cartopy==0.18.0 \ No newline at end of file diff --git a/HPC_setup/requirements_JUWELS_additionals.txt b/HPC_setup/requirements_JUWELS_additionals.txt index fd22a309913efa6478a4a00f94bac70433e21774..2ef108027e9928442661cc6ea78cba265482da52 100644 --- a/HPC_setup/requirements_JUWELS_additionals.txt +++ b/HPC_setup/requirements_JUWELS_additionals.txt @@ -10,16 +10,15 @@ cftime==1.4.1 chardet==4.0.0 coverage==5.4 cycler==0.10.0 -dask==2021.2.0 +dask==2.22.0 dill==0.3.3 fsspec==0.8.5 gast==0.4.0 -grpcio==1.35.0 -h5py==2.10.0 +grpcio==1.34.0 +h5py==3.1.0 idna==2.10 importlib-metadata==3.4.0 iniconfig==1.1.1 - kiwisolver==1.3.1 locket==0.2.1 Markdown==3.3.3 @@ -35,6 +34,7 @@ patsy==0.5.1 Pillow==8.1.0 pluggy==0.13.1 protobuf==3.15.0 +psutil==5.8.0 py==1.10.0 pydot==1.4.2 pyparsing==2.4.7 @@ -44,17 +44,18 @@ pytest-cov==2.11.1 pytest-html==3.1.1 pytest-lazy-fixture==0.6.3 pytest-metadata==1.11.0 -pytest-sugar +pytest-sugar==0.9.4 python-dateutil==2.8.1 pytz==2021.1 PyYAML==5.4.1 requests==2.25.1 -scipy==1.5.4 +scipy==1.5.2 seaborn==0.11.1 --no-binary shapely Shapely==1.7.0 six==1.15.0 statsmodels==0.12.2 tabulate==0.8.8 +tensorflow==2.5.0 termcolor==1.1.0 toml==0.10.2 toolz==0.11.1 @@ -64,3 +65,6 @@ Werkzeug==1.0.1 wget==3.2 xarray==0.16.2 zipp==3.4.0 + +#Cartopy==0.18.0 + diff --git a/mlair/run_modules/post_processing.py b/mlair/run_modules/post_processing.py index 180fb3d24d54a1de25cd6461770cc70819d2550d..fa6326050b611ed4e27d75867e920b7e70d2fa9f 100644 --- a/mlair/run_modules/post_processing.py +++ b/mlair/run_modules/post_processing.py @@ -457,8 +457,8 @@ class PostProcessing(RunEnvironment): """Evaluate test score of model and save locally.""" # test scores on transformed data - test_score = self.model.evaluate_generator(generator=self.test_data_distributed, - use_multiprocessing=True, verbose=0) + test_score = self.model.evaluate(self.test_data_distributed, + use_multiprocessing=True, verbose=0) path = self.data_store.get("model_path") with open(os.path.join(path, "test_scores.txt"), "a") as f: for index, item in enumerate(to_list(test_score)):