diff --git a/HPC_setup/mlt_modules_juwels.sh b/HPC_setup/mlt_modules_juwels.sh index d20b246d4f396363a23e68d64f89b6d3abaee8c4..01eecbab617f7b3042222e24e562901b302d401e 100755 --- a/HPC_setup/mlt_modules_juwels.sh +++ b/HPC_setup/mlt_modules_juwels.sh @@ -8,7 +8,7 @@ module --force purge module use $OTHERSTAGES -ml Stages/Devel-2019a +ml Stages/2019a ml GCCcore/.8.3.0 ml Jupyter/2019a-Python-3.6.8 @@ -18,4 +18,4 @@ ml Keras/2.2.4-GPU-Python-3.6.8 ml SciPy-Stack/2019a-Python-3.6.8 ml dask/1.1.5-Python-3.6.8 ml GEOS/3.7.1-Python-3.6.8 -ml Graphviz/2.40.1 \ No newline at end of file +ml Graphviz/2.40.1 diff --git a/HPC_setup/requirements_JUWELS_additionals.txt b/HPC_setup/requirements_JUWELS_additionals.txt index 0a2d6bc0f5cb4ce565b9eb69aad27cd1b3bbaef6..f6c09e23db84c28d2108dd4bace0d395445d8cb9 100644 --- a/HPC_setup/requirements_JUWELS_additionals.txt +++ b/HPC_setup/requirements_JUWELS_additionals.txt @@ -2,6 +2,8 @@ coverage==5.0.3 importlib-metadata==1.5.0 matplotlib==3.2.0 # in SciPy-Stack pandas==1.0.1 # in SciPy-Stack / but older version +protobuf==3.11.3 +pydot==1.4.1 py==1.8.1 # ? pyproj==2.5.0 # in basemap pyshp==2.1.0 # in basemap diff --git a/HPC_setup/setup_venv_juwels.sh b/HPC_setup/setup_venv_juwels.sh index b543db1ee5ac4bea4f64467e360a084a2156c02a..e8871473e24ac5b065290ead837e7db6e488bcd5 100755 --- a/HPC_setup/setup_venv_juwels.sh +++ b/HPC_setup/setup_venv_juwels.sh @@ -24,10 +24,16 @@ source ${cur}/../venv_juwels/bin/activate # export path for side-packages export PYTHONPATH=${cur}/../venv_juwels/lib/python3.6/site-packages:${PYTHONPATH} + +echo "##### START INSTALLING requirements_gpu.txt #####" +pip install -r ${cur}/../requirements_gpu.txt + +echo "##### FINISH INSTALLING requirements_gpu.txt #####" + pip install -r ${cur}/requirements_JUWELS_additionals.txt pip install --ignore-installed matplotlib==3.2.0 pip install --ignore-installed pandas==1.0.1 - +pip install -U typing_extensions # Comment: Maybe we have to export PYTHONPATH a second time ater activating the venv (after job allocation) # source venv/bin/activate diff --git a/mlair/configuration/defaults.py b/mlair/configuration/defaults.py index 31746ec889cc82ebbae8de82a05c5cff02a22ac0..afd6e7013dc89e56e979db919226c2365c7d0082 100644 --- a/mlair/configuration/defaults.py +++ b/mlair/configuration/defaults.py @@ -46,15 +46,19 @@ DEFAULT_USE_ALL_STATIONS_ON_ALL_DATA_SETS = True DEFAULT_EVALUATE_BOOTSTRAPS = True DEFAULT_CREATE_NEW_BOOTSTRAPS = False DEFAULT_NUMBER_OF_BOOTSTRAPS = 20 -DEFAULT_PLOT_LIST = ["PlotMonthlySummary", "PlotStationMap", "PlotClimatologicalSkillScore", "PlotTimeSeries", +#DEFAULT_PLOT_LIST = ["PlotMonthlySummary", "PlotStationMap", "PlotClimatologicalSkillScore", "PlotTimeSeries", +# "PlotCompetitiveSkillScore", "PlotBootstrapSkillScore", "PlotConditionalQuantiles", +# "PlotAvailability"] +DEFAULT_PLOT_LIST = ["PlotMonthlySummary", "PlotStationMap", "PlotClimatologicalSkillScore", "PlotCompetitiveSkillScore", "PlotBootstrapSkillScore", "PlotConditionalQuantiles", "PlotAvailability"] + def get_defaults(): """Return all default parameters set in defaults.py""" return {key: value for key, value in globals().items() if key.startswith('DEFAULT')} if __name__ == "__main__": - print(get_defaults()) \ No newline at end of file + print(get_defaults()) diff --git a/requirements_gpu.txt b/requirements_gpu.txt index 5ddb56acc71e0a51abb99b9447f871ddcb715a5d..38598ff6b902da6d96eb870124f60c72737000c2 100644 --- a/requirements_gpu.txt +++ b/requirements_gpu.txt @@ -2,7 +2,7 @@ absl-py==0.9.0 astor==0.8.1 atomicwrites==1.3.0 attrs==19.3.0 -Cartopy==0.17.0 +#Cartopy==0.17.0 certifi==2019.11.28 chardet==3.0.4 cloudpickle==1.3.0 @@ -16,9 +16,9 @@ grpcio==1.27.2 h5py==2.10.0 idna==2.8 importlib-metadata==1.5.0 -Keras==2.2.4 -Keras-Applications==1.0.8 -Keras-Preprocessing==1.1.0 +#Keras==2.2.4 +#Keras-Applications==1.0.8 +#Keras-Preprocessing==1.1.0 kiwisolver==1.1.0 locket==0.2.0 Markdown==3.2.1 @@ -54,10 +54,10 @@ seaborn==0.10.0 six==1.11.0 statsmodels==0.11.1 tabulate -tensorboard==1.13.1 -tensorflow-estimator==1.13.0 -tensorflow-gpu==1.13.1 -termcolor==1.1.0 +#tensorboard==1.13.1 +#tensorflow-estimator==1.13.0 +#tensorflow-gpu==1.13.1 +#termcolor==1.1.0 toolz==0.10.0 typing-extensions urllib3==1.25.8