build(Tensorflow-Addons): removed TF-addon and keras-applications sup…

…port
frankkramer-lab · Feb 21, 2024 · 8837e06 · 8837e06
1 parent 979a660
commit 8837e06
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 43 deletions.
diff --git a/aucmedi/automl/block_train.py b/aucmedi/automl/block_train.py
@@ -23,8 +23,7 @@
 import os
 import numpy as np
 import json
-from tensorflow.keras.metrics import AUC
-from tensorflow_addons.metrics import F1Score
+from tensorflow.keras.metrics import AUC, F1Score
 from tensorflow.keras.callbacks import ModelCheckpoint, CSVLogger, \
                                        ReduceLROnPlateau, EarlyStopping
 # Internal libraries

diff --git a/examples/tutorials/Augmentation.ipynb b/examples/tutorials/Augmentation.ipynb
@@ -126,7 +126,7 @@
    ],
    "source": [
     "from aucmedi.neural_network.model import NeuralNetwork\n",
-    "import tensorflow_addons as tfa\n",
+    "import tensorflow.keras as tfa\n",
     "\n",
     "f1Score = tfa.metrics.F1Score(num_classes=nclasses, threshold=0.5)\n",
     "\n",

diff --git a/examples/tutorials/CustomSubfunction.ipynb b/examples/tutorials/CustomSubfunction.ipynb
@@ -163,7 +163,7 @@
    ],
    "source": [
     "from aucmedi.neural_network.model import NeuralNetwork\n",
-    "import tensorflow_addons as tfa\n",
+    "import tensorflow.keras as tfa\n",
     "\n",
     "f1Score = tfa.metrics.F1Score(num_classes=nclasses, threshold=0.5)\n",
     "\n",

diff --git a/examples/tutorials/DataAndResultExploration.ipynb b/examples/tutorials/DataAndResultExploration.ipynb
@@ -531,7 +531,7 @@
    ],
    "source": [
     "from aucmedi.neural_network.model import NeuralNetwork\n",
-    "import tensorflow_addons as tfa\n",
+    "import tensorflow.keras as tfa\n",
     "\n",
     "f1Score = tfa.metrics.F1Score(num_classes=nclasses, threshold=0.5)\n",
     "\n",

diff --git a/examples/tutorials/EarlyStoppingAndTransferlearning.ipynb b/examples/tutorials/EarlyStoppingAndTransferlearning.ipynb
diff --git a/examples/tutorials/Metadata.ipynb b/examples/tutorials/Metadata.ipynb
@@ -266,7 +266,7 @@
    ],
    "source": [
     "from aucmedi.neural_network.model import NeuralNetwork\n",
-    "import tensorflow_addons as tfa\n",
+    "import tensorflow.keras as tfa\n",
     "\n",
     "f1Score = tfa.metrics.F1Score(num_classes=nclasses, threshold=0.5)\n",
     "\n",
@@ -405,7 +405,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.0"
   }
  },
  "nbformat": 4,

diff --git a/examples/tutorials/ThreePillars.ipynb b/examples/tutorials/ThreePillars.ipynb
diff --git a/examples/tutorials/Transferlearning.ipynb b/examples/tutorials/Transferlearning.ipynb
diff --git a/examples/tutorials/XAI.ipynb b/examples/tutorials/XAI.ipynb
diff --git a/examples/tutorials/dataLoadingFromDirectory.ipynb b/examples/tutorials/dataLoadingFromDirectory.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,4 @@
-tensorflow==2.11.1
-tensorflow-addons==0.18.0
-keras-applications==1.0.8
+tensorflow==2.14.0
 numpy==1.23.0
 pillow==9.3.0
 albumentations==1.3.0

diff --git a/setup.py b/setup.py
@@ -24,10 +24,8 @@
     entry_points={
         'console_scripts': ['aucmedi = aucmedi.automl.main:main'],
     },
-    python_requires='>=3.8',
-    install_requires=['tensorflow>=2.11.1',
-                      'tensorflow-addons>=0.18.0',
-                      'keras-applications>=1.0.8',
+    python_requires='>=3.9',
+    install_requires=['tensorflow>=2.14.0',
                       'numpy>=1.23.0',
                       'pillow>=9.3.0',
                       'albumentations>=1.3.0',