diff --git a/HPC_setup/mlt_modules_hdfml.sh b/HPC_setup/mlt_modules_hdfml.sh index 0ecbc13f6bf7284e9a3500e158bfcd8bcfb13804..e8458371ce71a486b98b402b956cfb6a4cd0ee0f 100644 --- a/HPC_setup/mlt_modules_hdfml.sh +++ b/HPC_setup/mlt_modules_hdfml.sh @@ -8,15 +8,16 @@ module --force purge module use $OTHERSTAGES -ml Stages/2019a -ml GCCcore/.8.3.0 -ml Python/3.6.8 -ml TensorFlow/1.13.1-GPU-Python-3.6.8 -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 +ml Stages/2020 +ml GCCcore/.9.3.0 + +ml Jupyter/2020.3.0-Python-3.8.5 +ml Python/3.8.5 +ml TensorFlow/2.3.1-Python-3.8.5 +ml SciPy-Stack/2020-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 diff --git a/HPC_setup/mlt_modules_juwels.sh b/HPC_setup/mlt_modules_juwels.sh index 8944b440143644984983a00ddda85a4a97b9db6d..5f131b61d82df91f996f38cd8f3e4a6b2d30657c 100755 --- a/HPC_setup/mlt_modules_juwels.sh +++ b/HPC_setup/mlt_modules_juwels.sh @@ -13,7 +13,6 @@ ml GCCcore/.9.3.0 ml Jupyter/2020.3.0-Python-3.8.5 ml Python/3.8.5 -# ml TensorFlow/1.13.1-GPU-Python-3.6.8 ml TensorFlow/2.3.1-Python-3.8.5 ml SciPy-Stack/2020-Python-3.8.5 ml dask/2.22.0-Python-3.8.5 diff --git a/requirements.txt b/requirements.txt index dba565fbb535db7d7782baec8690971d4393b3e0..68e37c02757a3979f6a85221af3676e34c4e813f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,15 +13,12 @@ cycler==0.10.0 dask==2021.2.0 dill==0.3.3 fsspec==0.8.5 -gast==0.4.0 +gast==0.3.3 grpcio==1.35.0 h5py==2.10.0 idna==2.10 importlib-metadata==3.4.0 iniconfig==1.1.1 -Keras==2.2.4 -Keras-Applications==1.0.8 -Keras-Preprocessing==1.1.2 kiwisolver==1.3.1 locket==0.2.1 Markdown==3.3.3 @@ -52,14 +49,11 @@ python-dateutil==2.8.1 pytz==2021.1 PyYAML==5.4.1 requests==2.25.1 -scipy==1.5.4 +scipy==1.4.1 seaborn==0.11.1 six==1.15.0 statsmodels==0.12.2 tabulate==0.8.8 -tensorboard==1.13.1 -tensorflow==1.13.1 -tensorflow-estimator==1.13.0 termcolor==1.1.0 toml==0.10.2 toolz==0.11.1 @@ -71,4 +65,5 @@ xarray==0.16.2 zipp==3.4.0 --no-binary shapely Shapely==1.7.0 -Cartopy==0.18.0 +# Cartopy==0.18.0 +tensorflow==2.3.1 \ No newline at end of file diff --git a/requirements_gpu.txt b/requirements_gpu.txt deleted file mode 100644 index f170e1b7b67df7e17a3258ca849b252acaf3e650..0000000000000000000000000000000000000000 --- a/requirements_gpu.txt +++ /dev/null @@ -1,74 +0,0 @@ -absl-py==0.11.0 -appdirs==1.4.4 -astor==0.8.1 -astropy==4.1 -attrs==20.3.0 -bottleneck==1.3.2 -cached-property==1.5.2 -certifi==2020.12.5 -cftime==1.4.1 -chardet==4.0.0 -coverage==5.4 -cycler==0.10.0 -dask==2021.2.0 -dill==0.3.3 -fsspec==0.8.5 -gast==0.4.0 -grpcio==1.35.0 -h5py==2.10.0 -idna==2.10 -importlib-metadata==3.4.0 -iniconfig==1.1.1 -Keras==2.2.4 -Keras-Applications==1.0.8 -Keras-Preprocessing==1.1.2 -kiwisolver==1.3.1 -locket==0.2.1 -Markdown==3.3.3 -matplotlib==3.3.4 -mock==4.0.3 -netCDF4==1.5.5.1 -numpy==1.19.5 -ordered-set==4.0.2 -packaging==20.9 -pandas==1.1.5 -partd==1.1.0 -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 -pyshp==2.1.3 -pytest==6.2.2 -pytest-cov==2.11.1 -pytest-html==3.1.1 -pytest-lazy-fixture==0.6.3 -pytest-metadata==1.11.0 -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 -seaborn==0.11.1 -six==1.15.0 -statsmodels==0.12.2 -tabulate==0.8.8 -tensorboard==1.13.1 -tensorflow-gpu==1.13.1 -tensorflow-estimator==1.13.0 -termcolor==1.1.0 -toml==0.10.2 -toolz==0.11.1 -typing-extensions==3.7.4.3 -urllib3==1.26.3 -Werkzeug==1.0.1 -wget==3.2 -xarray==0.16.1 -zipp==3.4.0 - ---no-binary shapely Shapely==1.7.0 -Cartopy==0.18.0 diff --git a/requirements_tf2.txt b/requirements_tf2.txt deleted file mode 100644 index 21cc5f367d8eada1d679070138639dec81b6eda6..0000000000000000000000000000000000000000 --- a/requirements_tf2.txt +++ /dev/null @@ -1,69 +0,0 @@ -absl-py==0.11.0 -appdirs==1.4.4 -astor==0.8.1 -astropy==4.1 -attrs==20.3.0 -bottleneck==1.3.2 -cached-property==1.5.2 -certifi==2020.12.5 -cftime==1.4.1 -chardet==4.0.0 -coverage==5.4 -cycler==0.10.0 -dask==2021.2.0 -dill==0.3.3 -fsspec==0.8.5 -gast==0.3.3 -grpcio==1.35.0 -h5py==2.10.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 -matplotlib==3.3.4 -mock==4.0.3 -netCDF4==1.5.5.1 -numpy==1.19.5 -ordered-set==4.0.2 -packaging==20.9 -pandas==1.1.5 -partd==1.1.0 -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 -pyshp==2.1.3 -pytest==6.2.2 -pytest-cov==2.11.1 -pytest-html==3.1.1 -pytest-lazy-fixture==0.6.3 -pytest-metadata==1.11.0 -pytest-sugar==0.9.4 -python-dateutil==2.8.1 -pytz==2021.1 -PyYAML==5.4.1 -requests==2.25.1 -scipy==1.4.1 -seaborn==0.11.1 -six==1.15.0 -statsmodels==0.12.2 -tabulate==0.8.8 -termcolor==1.1.0 -toml==0.10.2 -toolz==0.11.1 -typing-extensions==3.7.4.3 -urllib3==1.26.3 -Werkzeug==1.0.1 -wget==3.2 -xarray==0.16.2 -zipp==3.4.0 - ---no-binary shapely Shapely==1.7.0 -# Cartopy==0.18.0 -tensorflow==2.2.0