Use tensorflow >=2.16 to avoid having reinstall keras3

airbus · Mar 19, 2024 · 4f7bd2f · 4f7bd2f
1 parent 02f00ee
commit 4f7bd2f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 43 deletions.
diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
@@ -90,9 +90,6 @@ jobs:
           python -m pip install -U pip setuptools
           pip install .
           pip install -r docs/requirements.txt
-          # ensure having keras 3 instead of keras 2.15 installed by tensorflow
-          pip uninstall -y keras
-          pip install "keras>=3"
       - name: generate documentation
         id: sphinx-build
         run: |

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -8,7 +8,7 @@ dependencies:
       - kaggle
       - pandas
       - scipy
-      - tensorboard>=2.13
-#      - tensorflow>=2.15  # conflicting dependencies with decomon (keras 2)
+      - tensorboard>=2.16
+      - tensorflow>=2.16
       - jupyter-server-proxy
-      - ..  # decomon
+      - ..  # decomon
diff --git a/binder/postBuild b/binder/postBuild
@@ -1,9 +1,3 @@
-# install tensorflow backend separately from decomon (dependencies conflict as tf 2.15 requires keras 2)
-pip install tensorflow>=2.15
-# use keras 3 instead of keras 2 installed by tensorflow
-pip uninstall -y keras
-pip install "keras>=3"
-
 # tensorboard launches at startup
 mv binder/tensorboardserverextension.py ${NB_PYTHON_PREFIX}/lib/python*/site-packages/
 # enable tensorboard extension

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,4 @@
 sphinx
 myst_parser
 sphinx_rtd_theme
-tensorflow>=2.15  # install a backend for keras 3 (and tensorflow is the one needed by default)
+tensorflow>=2.16  # install a backend for keras 3 (and tensorflow is the one needed by default)
diff --git a/tox.ini b/tox.ini
@@ -15,15 +15,12 @@ deps =
     pytest<8
     pytest-cases
     py39-linux-tf: pytest-cov
-    tf: tensorflow>=2.15  # backend for keras 3
+    tf: tensorflow>=2.16  # backend for keras 3
     torch: torch>=2.1.0  # backend for keras 3
 setenv =
     tf: KERAS_BACKEND=tensorflow
     torch: KERAS_BACKEND=torch
 commands =
-    # be sure to get keras 3 instead of keras 2 brought back by tensorflow 2.15
-    pip uninstall keras  -y
-    pip install "keras>=3"
     pip list
     python -c 'import keras; print(keras.config.backend())'
     pytest -v \

diff --git a/tutorials/tutorial1_sinus-interactive.ipynb b/tutorials/tutorial1_sinus-interactive.ipynb
@@ -56,10 +56,7 @@
     "    !{sys.executable} -m pip install -U pip\n",
     "    !{sys.executable} -m pip install git+https://github.com/airbus/decomon@main#egg=decomon\n",
     "    # install desired backend (by default tensorflow)\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.15\"\n",
-    "    # ensure having keras 3 and not keras 2.15\n",
-    "    !{sys.executable} -m pip uninstall -y keras\n",
-    "    !{sys.executable} -m pip install \"keras>=3\""
+    "    !{sys.executable} -m pip install \"tensorflow>=2.16\""
    ]
   },
   {
@@ -423,7 +420,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.9.18"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/tutorials/tutorial2_noise_sensor.ipynb b/tutorials/tutorial2_noise_sensor.ipynb
@@ -60,10 +60,7 @@
     "    !{sys.executable} -m pip install -U pip\n",
     "    !{sys.executable} -m pip install git+https://github.com/airbus/decomon@main#egg=decomon\n",
     "    # install desired backend (by default tensorflow)\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.15\"\n",
-    "    # ensure having keras 3 and not keras 2.15\n",
-    "    !{sys.executable} -m pip uninstall -y keras\n",
-    "    !{sys.executable} -m pip install \"keras>=3\""
+    "    !{sys.executable} -m pip install \"tensorflow>=2.16\""
    ]
   },
   {
@@ -492,7 +489,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.9.18"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/tutorials/tutorial3_adversarial_attack.ipynb b/tutorials/tutorial3_adversarial_attack.ipynb
@@ -58,10 +58,7 @@
     "    !{sys.executable} -m pip install -U pip\n",
     "    !{sys.executable} -m pip install git+https://github.com/airbus/decomon@main#egg=decomon\n",
     "    # install desired backend (by default tensorflow)\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.15\"\n",
-    "    # ensure having keras 3 and not keras 2.15\n",
-    "    !{sys.executable} -m pip uninstall -y keras\n",
-    "    !{sys.executable} -m pip install \"keras>=3\""
+    "    !{sys.executable} -m pip install \"tensorflow>=2.16\""
    ]
   },
   {
@@ -506,7 +503,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.9.18"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/tutorials/tutorial4_certified_over_estimation.ipynb b/tutorials/tutorial4_certified_over_estimation.ipynb
@@ -67,10 +67,7 @@
     "    !{sys.executable} -m pip install -U pip\n",
     "    !{sys.executable} -m pip install git+https://github.com/airbus/decomon@main#egg=decomon\n",
     "    # install desired backend (by default tensorflow)\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.15\"\n",
-    "    # ensure having keras 3 and not keras 2.15\n",
-    "    !{sys.executable} -m pip uninstall -y keras\n",
-    "    !{sys.executable} -m pip install \"keras>=3\""
+    "    !{sys.executable} -m pip install \"tensorflow>=2.16\""
    ]
   },
   {
@@ -735,7 +732,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.9.18"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/tutorials/z_Advanced/tensorboard-and-decomon.ipynb b/tutorials/z_Advanced/tensorboard-and-decomon.ipynb
@@ -54,14 +54,10 @@
     "    import sys  # noqa: avoid having this import removed by pycln\n",
     "\n",
     "    # install dev version for dev doc, or release version for release doc\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.13\" \"tensorboard>=2.13\" \"keras>=2.13\"\n",
     "    !{sys.executable} -m pip install -U pip\n",
     "    !{sys.executable} -m pip install git+https://github.com/airbus/decomon@main#egg=decomon\n",
     "    # install desired backend (by default tensorflow)\n",
-    "    !{sys.executable} -m pip install \"tensorflow>=2.15\"\n",
-    "    # ensure having keras 3 and not keras 2.15\n",
-    "    !{sys.executable} -m pip uninstall -y keras\n",
-    "    !{sys.executable} -m pip install \"keras>=3\""
+    "    !{sys.executable} -m pip install \"tensorflow>=2.16 tensorboard>=2.16\""
    ]
   },
   {
@@ -356,7 +352,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.12"
+   "version": "3.9.18"
   },
   "toc": {
    "base_numbering": 1,