diff --git a/requirements/_requirements_base.txt b/requirements/_requirements_base.txt index f446422..4054ee3 100644 --- a/requirements/_requirements_base.txt +++ b/requirements/_requirements_base.txt @@ -1,12 +1,14 @@ tqdm>=4.64 psutil>=5.9.0 -numexpr>=2.8.3 +numexpr>=2.7.3; python_version < '3.9' # >=2.8.0 conflicts in Conda +numexpr>=2.8.3; python_version >= '3.9' opencv-python>=4.6.0.0 pillow>=9.2.0 scikit-learn==1.0.2; python_version < '3.9' # AMD needs version 1.0.2 and 1.1.0 not available in Python 3.7 scikit-learn>=1.1.0; python_version >= '3.9' fastcluster>=1.2.6 -matplotlib>=3.5.1,<3.6.0 +matplotlib>=3.4.3,<3.6.0; python_version < '3.9' # >=3.5.0 conflicts in Conda +matplotlib>=3.5.1,<3.6.0; python_version >= '3.9' imageio>=2.19.3 imageio-ffmpeg>=0.4.7 ffmpy>=0.3.0 diff --git a/requirements/requirements_amd.txt b/requirements/requirements_amd.txt index b235e2c..87c2844 100644 --- a/requirements/requirements_amd.txt +++ b/requirements/requirements_amd.txt @@ -1,6 +1,6 @@ -r _requirements_base.txt # tf2.2 is last version that tensorboard logging works with old Keras -numpy>=1.18.0,<1.20.0 +numpy>=1.18.0,<1.19.0 # TF Will uninstall anything equal or over 1.19.0 protobuf>= 3.19.0,<3.20.0 # TF has started pulling in incompatible protobuf tensorflow>=2.2.0,<2.3.0 plaidml-keras==0.7.0