diff --git a/HPC_setup/create_runscripts_HPC.sh b/HPC_setup/create_runscripts_HPC.sh index 730aa52ef42144826bd000d88c0fc81c9d508de0..b3d9d644334d06ff674a22274bf4e04619853b15 100755 --- a/HPC_setup/create_runscripts_HPC.sh +++ b/HPC_setup/create_runscripts_HPC.sh @@ -85,7 +85,7 @@ source venv_${hpcsys}/bin/activate timestamp=\`date +"%Y-%m-%d_%H%M-%S"\` -export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.8/site-packages:\${PYTHONPATH} +export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.9/site-packages:\${PYTHONPATH} srun --cpu-bind=none python run.py --experiment_date=\$timestamp EOT @@ -111,7 +111,7 @@ source venv_${hpcsys}/bin/activate timestamp=\`date +"%Y-%m-%d_%H%M-%S"\` -export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.8/site-packages:\${PYTHONPATH} +export PYTHONPATH=\${PWD}/venv_${hpcsys}/lib/python3.9/site-packages:\${PYTHONPATH} srun --cpu-bind=none python run_HPC.py --experiment_date=\$timestamp EOT diff --git a/HPC_setup/mlt_modules_hdfml.sh b/HPC_setup/mlt_modules_hdfml.sh index df8ae0830ad70c572955447b1c5e87341b8af9ec..4efc5a69987f4a4687080740b93543bcf8107c4c 100644 --- a/HPC_setup/mlt_modules_hdfml.sh +++ b/HPC_setup/mlt_modules_hdfml.sh @@ -8,13 +8,12 @@ module --force purge module use $OTHERSTAGES -ml Stages/2020 -ml GCCcore/.10.3.0 +ml Stages/2022 +ml GCCcore/.11.2.0 -ml Jupyter/2021.3.1-Python-3.8.5 -ml Python/3.8.5 -ml TensorFlow/2.5.0-Python-3.8.5 -ml SciPy-Stack/2021-Python-3.8.5 -ml dask/2.22.0-Python-3.8.5 -ml GEOS/3.8.1-Python-3.8.5 -ml Graphviz/2.44.1 \ No newline at end of file +ml Python/3.9.6 +ml TensorFlow/2.6.0-CUDA-11.5 +ml dask/2021.9.1 +ml GEOS/3.9.1 +ml Cartopy/0.20.0 +ml Graphviz/2.49.3 diff --git a/HPC_setup/mlt_modules_juwels.sh b/HPC_setup/mlt_modules_juwels.sh index ffacfe6fc45302dfa60b108ca2493d9a27408df1..37636fb8834601768ade2d86dc8c7287e273a5d4 100755 --- a/HPC_setup/mlt_modules_juwels.sh +++ b/HPC_setup/mlt_modules_juwels.sh @@ -8,13 +8,12 @@ module --force purge module use $OTHERSTAGES -ml Stages/2020 -ml GCCcore/.10.3.0 +ml Stages/2022 +ml GCCcore/.11.2.0 -ml Jupyter/2021.3.1-Python-3.8.5 -ml Python/3.8.5 -ml TensorFlow/2.5.0-Python-3.8.5 -ml SciPy-Stack/2021-Python-3.8.5 -ml dask/2.22.0-Python-3.8.5 -ml GEOS/3.8.1-Python-3.8.5 -ml Graphviz/2.44.1 \ No newline at end of file +ml Python/3.9.6 +ml TensorFlow/2.6.0-CUDA-11.5 +ml dask/2021.9.1 +ml GEOS/3.9.1 +ml Cartopy/0.20.0 +ml Graphviz/2.49.3 diff --git a/HPC_setup/requirements_HDFML_additionals.txt b/HPC_setup/requirements_HDFML_additionals.txt index ebfac3cd0d989a8845f2a3fceba33d562b898b8d..90ccd220394c9afb00fba7e069af8e677d4ae0b2 100644 --- a/HPC_setup/requirements_HDFML_additionals.txt +++ b/HPC_setup/requirements_HDFML_additionals.txt @@ -1,15 +1,19 @@ -astropy==4.1 -bottleneck==1.3.2 -cached-property==1.5.2 -iniconfig==1.1.1 -ordered-set==4.0.2 -pyshp==2.1.3 -pytest-html==3.1.1 -pytest-lazy-fixture==0.6.3 -pytest-metadata==1.11.0 -pytest-sugar==0.9.4 -tabulate==0.8.8 +astropy==5.1 +pytz==2022.1 +python-dateutil==2.8.2 +requests==2.28.1 +werkzeug>=0.11.15 +wheel>=0.26 +six==1.15.0 +psutil==5.9.1 +pyparsing==3.0.9 +packaging==21.3 +timezonefinder==5.2.0 +patsy==0.5.2 +statsmodels==0.13.2 +seaborn==0.11.2 +xarray==0.16.2 +tabulate==0.8.10 wget==3.2 ---no-binary shapely Shapely==1.7.0 - -#Cartopy==0.18.0 +pydot==1.4.2 +netcdf4==1.6.0 \ No newline at end of file diff --git a/HPC_setup/requirements_JUWELS_additionals.txt b/HPC_setup/requirements_JUWELS_additionals.txt index ebfac3cd0d989a8845f2a3fceba33d562b898b8d..90ccd220394c9afb00fba7e069af8e677d4ae0b2 100644 --- a/HPC_setup/requirements_JUWELS_additionals.txt +++ b/HPC_setup/requirements_JUWELS_additionals.txt @@ -1,15 +1,19 @@ -astropy==4.1 -bottleneck==1.3.2 -cached-property==1.5.2 -iniconfig==1.1.1 -ordered-set==4.0.2 -pyshp==2.1.3 -pytest-html==3.1.1 -pytest-lazy-fixture==0.6.3 -pytest-metadata==1.11.0 -pytest-sugar==0.9.4 -tabulate==0.8.8 +astropy==5.1 +pytz==2022.1 +python-dateutil==2.8.2 +requests==2.28.1 +werkzeug>=0.11.15 +wheel>=0.26 +six==1.15.0 +psutil==5.9.1 +pyparsing==3.0.9 +packaging==21.3 +timezonefinder==5.2.0 +patsy==0.5.2 +statsmodels==0.13.2 +seaborn==0.11.2 +xarray==0.16.2 +tabulate==0.8.10 wget==3.2 ---no-binary shapely Shapely==1.7.0 - -#Cartopy==0.18.0 +pydot==1.4.2 +netcdf4==1.6.0 \ No newline at end of file diff --git a/HPC_setup/setup_venv_hdfml.sh b/HPC_setup/setup_venv_hdfml.sh index f1b4a63f9a5c90d7afacb5c3dc027adb4e6e29fc..11c273b477ea26383e53799ae0025ceb5c947a4a 100644 --- a/HPC_setup/setup_venv_hdfml.sh +++ b/HPC_setup/setup_venv_hdfml.sh @@ -22,7 +22,7 @@ python3 -m venv ${cur}../venv_hdfml source ${cur}/../venv_hdfml/bin/activate # export path for side-packages -export PYTHONPATH=${cur}/../venv_hdfml/lib/python3.8/site-packages:${PYTHONPATH} +export PYTHONPATH=${cur}/../venv_hdfml/lib/python3.9/site-packages:${PYTHONPATH} echo "##### START INSTALLING requirements_HDFML_additionals.txt #####" pip install -r ${cur}/requirements_HDFML_additionals.txt diff --git a/HPC_setup/setup_venv_juwels.sh b/HPC_setup/setup_venv_juwels.sh index 3e1f489532ef118522ccd37dd56cf6e6306046ac..8d609b8f5094de4e3840aad50656b5c11ff1a86d 100755 --- a/HPC_setup/setup_venv_juwels.sh +++ b/HPC_setup/setup_venv_juwels.sh @@ -22,7 +22,7 @@ python3 -m venv ${cur}/../venv_juwels source ${cur}/../venv_juwels/bin/activate # export path for side-packages -export PYTHONPATH=${cur}/../venv_juwels/lib/python3.8/site-packages:${PYTHONPATH} +export PYTHONPATH=${cur}/../venv_juwels/lib/python3.9/site-packages:${PYTHONPATH} echo "##### START INSTALLING requirements_JUWELS_additionals.txt #####" diff --git a/mlair/run_modules/post_processing.py b/mlair/run_modules/post_processing.py index 7dc61f89967b5992434e948fe2ba1fc37a4b651b..6e4bac3dba4df6fcab689603a87221730ba2b9b2 100644 --- a/mlair/run_modules/post_processing.py +++ b/mlair/run_modules/post_processing.py @@ -617,19 +617,16 @@ class PostProcessing(RunEnvironment): try: if "PlotStationMap" in plot_list: - if self.data_store.get("hostname")[:2] in self.data_store.get("hpc_hosts") or self.data_store.get( - "hostname")[:6] in self.data_store.get("hpc_hosts"): - logging.warning( - f"Skip 'PlotStationMap` because running on a hpc node: {self.data_store.get('hostname')}") - else: - gens = [(self.train_data, {"marker": 5, "ms": 9}), - (self.val_data, {"marker": 6, "ms": 9}), - (self.test_data, {"marker": 4, "ms": 9})] - PlotStationMap(generators=gens, plot_folder=self.plot_path) - gens = [(self.train_val_data, {"marker": 8, "ms": 9}), - (self.test_data, {"marker": 9, "ms": 9})] - PlotStationMap(generators=gens, plot_folder=self.plot_path, plot_name="station_map_var") + gens = [(self.train_data, {"marker": 5, "ms": 9}), + (self.val_data, {"marker": 6, "ms": 9}), + (self.test_data, {"marker": 4, "ms": 9})] + PlotStationMap(generators=gens, plot_folder=self.plot_path) + gens = [(self.train_val_data, {"marker": 8, "ms": 9}), + (self.test_data, {"marker": 9, "ms": 9})] + PlotStationMap(generators=gens, plot_folder=self.plot_path, plot_name="station_map_var") except Exception as e: + if self.data_store.get("hostname")[:2] in self.data_store.get("hpc_hosts") or self.data_store.get("hostname")[:6] in self.data_store.get("hpc_hosts"): + logging.info(f"PlotStationMap might have failed as current workflow is running on hpc node {self.data_store.get('hostname')}. To download geographic elements, please run PlotStationMap once on login node.") logging.error(f"Could not create plot PlotStationMap due to the following error: {e}" f"\n{sys.exc_info()[0]}\n{sys.exc_info()[1]}\n{sys.exc_info()[2]}") diff --git a/requirements.txt b/requirements.txt index 3afc17b67fddbf5a269df1e1b7e103045630a290..6bb524a0ee1ebff05d82d8bacf5238c7152ef385 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,35 @@ -astropy==4.1 +astropy==5.1 auto_mix_prep==0.2.0 -Cartopy==0.18.0 -dask==2021.3.0 +Cartopy==0.20.0 +dask==2021.9.1 dill==0.3.3 -fsspec==2021.11.0 +fsspec==2021.10.1 keras==2.6.0 keras_nightly==2.5.0.dev2021032900 locket==0.2.1 -matplotlib==3.3.4 +matplotlib==3.4.3 mock==4.0.3 -netcdf4==1.5.8 -numpy==1.19.5 -pandas==1.1.5 +netcdf4==1.6.0 +numpy==1.21.3 +pandas==1.3.4 partd==1.2.0 -psutil==5.8.0 +psutil==5.9.1 pydot==1.4.2 pytest==6.2.2 pytest-cov==2.11.1 pytest-html==3.1.1 pytest-lazy-fixture==0.6.3 -requests==2.25.1 -scipy==1.5.2 -seaborn==0.11.1 +requests==2.28.1 +scipy==1.7.1 +seaborn==0.11.2 setuptools==47.1.0 --no-binary shapely Shapely==1.8.0 six==1.15.0 -statsmodels==0.12.2 -tabulate==0.8.9 -tensorflow==2.5.0 -toolz==0.11.2 -typing_extensions==3.7.4.3 +statsmodels==0.13.2 +tabulate==0.8.10 +tensorflow==2.6.0 +timezonefinder==5.2.0 +toolz==0.11.1 +typing_extensions==3.10.0.0 wget==3.2 xarray==0.16.2