Support tensorflow>=2.5, pytorch>=1.9 (#140)

* Light refactoring of test_tensorflow_keras_models.py

* Removed (almost) all tensorflow.python imports from test_tensorflow_keras_models.py

* Removed as many as possible tensorflow.python imports from tensorflow_keras.py

* Add compatibility layer for tensorflow<->keras to support tensorflow>=2.6

* Require tensorflow>=2.5 and torch>=1.9

Author: gsakkis

.github/workflows/ci.yml

@@ -12,13 +12,9 @@ jobs:
       fail-fast: false
       matrix:
         ml-deps:
-          - "torch==1.8.1+cpu tensorflow-cpu==2.4.4"
           - "torch==1.9.1+cpu tensorflow-cpu==2.5.3"
-          - "torch==1.10.2+cpu tensorflow-cpu==2.4.4"
-          - "torch==1.11.0+cpu tensorflow-cpu==2.4.4"
-          # remove the previous two lines and uncomment the next two after 2.6+ support
-          # - "torch==1.10.2+cpu tensorflow-cpu==2.6.3"
-          # - "torch==1.11.0+cpu tensorflow-cpu==2.7.1"
+          - "torch==1.10.2+cpu tensorflow-cpu==2.6.3"
+          - "torch==1.11.0+cpu tensorflow-cpu==2.7.1"
 
     env:
       run_coverage: ${{ github.ref == 'refs/heads/master' }}

setup.py

@@ -1,7 +1,7 @@
 import setuptools
 
-tensorflow = ["tensorflow>=2.4.1,<2.6"]
-pytorch = ["torch>=1.8.1"]
+tensorflow = ["tensorflow>=2.5"]
+pytorch = ["torch>=1.9"]
 sklearn = ["scikit-learn>=1.0"]
 cloud = ["tiledb-cloud"]
 full = sorted({"torchvision", *tensorflow, *pytorch, *sklearn, *cloud})