Merge branch 'dev_1.12.2' into patch-5

Author: beat-buesser

.github/workflows/dockerhub.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           images: adversarialrobustnesstoolbox/releases
           tags: |
-            type=raw,value={{branch}}-1.12.0-{{sha}}
+            type=raw,value={{branch}}-1.12.1-{{sha}}
             type=semver,pattern={{version}}
 
       - name: Build and push Docker image

art/__init__.py

@@ -12,7 +12,7 @@
 from art import preprocessing
 
 # Semantic Version
-__version__ = "1.12.0"
+__version__ = "1.12.1"
 
 # pylint: disable=C0103
 

art/attacks/evasion/__init__.py

@@ -1,6 +1,9 @@
 """
 Module providing evasion attacks under a common interface.
 """
+# pylint: disable=C0413
+import importlib
+
 from art.attacks.evasion.adversarial_patch.adversarial_patch import AdversarialPatch
 from art.attacks.evasion.adversarial_patch.adversarial_patch_numpy import AdversarialPatchNumpy
 from art.attacks.evasion.adversarial_patch.adversarial_patch_tensorflow import AdversarialPatchTensorFlowV2
@@ -9,7 +12,10 @@
 from art.attacks.evasion.adversarial_asr import CarliniWagnerASR
 from art.attacks.evasion.auto_attack import AutoAttack
 from art.attacks.evasion.auto_projected_gradient_descent import AutoProjectedGradientDescent
-from art.attacks.evasion.brendel_bethge import BrendelBethgeAttack
+
+if importlib.util.find_spec("numba") is not None:
+    from art.attacks.evasion.brendel_bethge import BrendelBethgeAttack
+
 from art.attacks.evasion.boundary import BoundaryAttack
 from art.attacks.evasion.carlini import CarliniL2Method, CarliniLInfMethod, CarliniL0Method
 from art.attacks.evasion.decision_tree_attack import DecisionTreeAttack

art/estimators/object_detection/pytorch_yolo.py

@@ -253,6 +253,8 @@ def _get_losses(
         import torch  # lgtm [py/repeated-import]
 
         self._model.train()
+        self.set_batchnorm(train=False)
+        self.set_dropout(train=False)
 
         # Apply preprocessing
         if self.all_framework_preprocessing:

docs/conf.py

@@ -27,7 +27,7 @@
 # The short X.Y version
 version = "1.12"
 # The full version, including alpha/beta/rc tags
-release = "1.12.0"
+release = "1.12.1"
 
 
 # -- General configuration ---------------------------------------------------

requirements_test.txt

@@ -34,15 +34,15 @@ torch==1.12.1
 torchaudio==0.12.1+cpu
 torchvision==0.13.1+cpu
 
-catboost==1.0.6
+catboost==1.1
 GPy==1.10.0
 lightgbm==3.3.2
 xgboost==1.6.2
 
 kornia~=0.6.7
 tensorboardX==2.5.1
-lief==0.12.1
-jax[cpu]==0.3.17
+lief==0.12.2
+jax[cpu]==0.3.21
 
 # Lingvo ASR dependencies
 # supported versions: (lingvo==0.6.4 with tensorflow-gpu==2.1.0)
@@ -54,8 +54,8 @@ jax[cpu]==0.3.17
 pytest~=7.1.3
 pytest-flake8~=1.1.1
 flake8~=4.0.1
-pytest-mock~=3.8.2
-pytest-cov~=3.0.0
+pytest-mock~=3.9.0
+pytest-cov~=4.0.0
 codecov~=2.1.12
 requests~=2.28.1
 

setup.py

@@ -13,7 +13,6 @@
     "six",
     "setuptools",
     "tqdm",
-    "numba>=0.53.1",
 ]
 
 docs_require = [
@@ -93,6 +92,7 @@ def get_version(rel_path):
             "cma",
             "librosa",
             "opencv-python",
+            "numba",
         ],
         "non_framework": [
             "matplotlib",
@@ -112,6 +112,7 @@ def get_version(rel_path):
             "codecov",
             "requests",
             "sortedcontainers",
+            "numba",
         ],
     },
     classifiers=[