Merge branch 'main' into dependabot/pip/kornia-approx-eq-0.6.12

Author: beat-buesser

.github/workflows/dockerhub.yml

@@ -31,15 +31,15 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
         with:
           images: adversarialrobustnesstoolbox/releases
           tags: |
             type=raw,value={{branch}}-1.14.1-{{sha}}
             type=semver,pattern={{version}}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf
         with:
           context: .
           push: true

examples/adversarial_training_cifar10.py

@@ -7,6 +7,10 @@
 
 import logging
 
+import tensorflow as tf
+
+tf.compat.v1.disable_eager_execution()
+
 from keras.models import Sequential
 from keras.layers import Dense, Flatten, Conv2D, MaxPooling2D, Activation, Dropout
 import numpy as np

examples/get_started_keras.py

@@ -10,7 +10,7 @@
 from tensorflow.keras.models import Sequential
 from tensorflow.keras.layers import Dense, Flatten, Conv2D, MaxPooling2D
 from tensorflow.keras.losses import categorical_crossentropy
-from tensorflow.keras.optimizers import Adam
+from tensorflow.keras.optimizers.legacy import Adam
 import numpy as np
 
 from art.attacks.evasion import FastGradientMethod

notebooks/poisoning_defense_neural_cleanse.ipynb

@@ -55,7 +55,11 @@
     "from art.utils import load_mnist, preprocess\n",
     "from art.defences.detector.poison import ActivationDefence\n",
     "from art.defences.transformer.poisoning import NeuralCleanse\n",
-    "from art.estimators.certification.neural_cleanse import KerasNeuralCleanse\n"
+    "from art.estimators.poison_mitigation import KerasNeuralCleanse\n",
+    "\n",
+    "import tensorflow as tf\n",
+    "if tf.executing_eagerly():\n",
+    "    tf.compat.v1.disable_eager_execution()"
    ]
   },
   {