diff --git a/HPC_setup/requirements_HDFML_additionals.txt b/HPC_setup/requirements_HDFML_additionals.txt index f84f2246f0df80c0fdf2bdf2ab452e99562bb9ad..ebfac3cd0d989a8845f2a3fceba33d562b898b8d 100644 --- a/HPC_setup/requirements_HDFML_additionals.txt +++ b/HPC_setup/requirements_HDFML_additionals.txt @@ -1,71 +1,15 @@ -tensorflow==2.5.0 -numpy==1.19.5 -six==1.15.0 -absl-py==0.11.0 -aiohttp==3.7.4 -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 -cchardet==2.1.7 -coverage==5.4 -cycler==0.10.0 -dask==2.22.0 -dill==0.3.3 -fsspec==0.8.5 -gast==0.4.0 -grpcio==1.34.0 -h5py==3.1.0 -idna==2.10 -importlib-metadata==3.4.0 iniconfig==1.1.1 -ipython==7.28.0 -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 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.2 -seaborn==0.11.1 ---no-binary shapely Shapely==1.7.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 \ No newline at end of file +#Cartopy==0.18.0 diff --git a/HPC_setup/setup_venv_hdfml.sh b/HPC_setup/setup_venv_hdfml.sh index ad5b12763dc0065f925baad39e244b31b762ba96..5f10680e1bdcbbdad1dfe8992e83ead93eeb53da 100644 --- a/HPC_setup/setup_venv_hdfml.sh +++ b/HPC_setup/setup_venv_hdfml.sh @@ -24,10 +24,13 @@ source ${cur}/../venv_hdfml/bin/activate # export path for side-packages export PYTHONPATH=${cur}/../venv_hdfml/lib/python3.6/site-packages:${PYTHONPATH} +echo "##### START INSTALLING requirements_HDFML_additionals.txt #####" pip install -r ${cur}/requirements_HDFML_additionals.txt -pip install --ignore-installed matplotlib==3.2.0 -pip install --ignore-installed pandas==1.0.1 -pip install --ignore-installed statsmodels==0.11.1 +echo "##### FINISH INSTALLING requirements_HDFML_additionals.txt #####" + +# pip install --ignore-installed matplotlib==3.2.0 +# pip install --ignore-installed pandas==1.0.1 +# pip install --ignore-installed statsmodels==0.11.1 pip install --ignore-installed tabulate pip install -U typing_extensions # see wiki on hdfml for information oh h5py: diff --git a/mlair/keras_legacy/__init__.py b/mlair/keras_legacy/__init__.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e24005654195f776c28ebc15e521cb6924369b0 100644 --- a/mlair/keras_legacy/__init__.py +++ b/mlair/keras_legacy/__init__.py @@ -0,0 +1 @@ +""" the modules in this directory are TAKEN FROM Keras 2.2.0 """ diff --git a/mlair/model_modules/advanced_paddings.py b/mlair/model_modules/advanced_paddings.py index 2dfcbcfa8386428b81bb46b08bfbc3c7ae3cf7e5..dcf529a0d31229d328f6c66a5995b958a868cfa6 100644 --- a/mlair/model_modules/advanced_paddings.py +++ b/mlair/model_modules/advanced_paddings.py @@ -20,7 +20,7 @@ from mlair.keras_legacy import conv_utils # from mlair.keras_legacy.generic_utils import transpose_shape - +""" TAKEN FROM KERAS 2.2.0 """ def transpose_shape(shape, target_format, spatial_axes): """Converts a tuple or a list to the correct `data_format`. It does so by switching the positions of its elements. @@ -64,7 +64,7 @@ def transpose_shape(shape, target_format, spatial_axes): '"channels_first", "channels_last". Received: ' + str(target_format)) - +""" TAKEN FROM KERAS 2.2.0 """ def normalize_data_format(value): """Checks that the value correspond to a valid data format. # Arguments @@ -193,7 +193,7 @@ class PadUtils: f'Found: {padding} of type {type(padding)}') return normalized_padding - +""" TAKEN FROM KERAS 2.2.0 """ class InputSpec(object): """Specifies the ndim, dtype and shape of every input to a layer. Every layer should expose (if appropriate) an `input_spec` attribute: @@ -236,7 +236,7 @@ class InputSpec(object): ('axes=' + str(self.axes)) if self.axes else ''] return 'InputSpec(%s)' % ', '.join(x for x in spec if x) - +""" TAKEN FROM KERAS 2.2.0 """ class _ZeroPadding(Layer): """Abstract nD ZeroPadding layer (private, used as implementation base). # Arguments