Skip to content

Commit 535e305

Browse files
authored
Merge branch 'dev_1.12.2' into verification_fix
2 parents 358ab1a + dc29bbc commit 535e305

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

art/attacks/evasion/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
"""
22
Module providing evasion attacks under a common interface.
33
"""
4+
# pylint: disable=C0413
5+
import importlib
6+
47
from art.attacks.evasion.adversarial_patch.adversarial_patch import AdversarialPatch
58
from art.attacks.evasion.adversarial_patch.adversarial_patch_numpy import AdversarialPatchNumpy
69
from art.attacks.evasion.adversarial_patch.adversarial_patch_tensorflow import AdversarialPatchTensorFlowV2
@@ -9,7 +12,10 @@
912
from art.attacks.evasion.adversarial_asr import CarliniWagnerASR
1013
from art.attacks.evasion.auto_attack import AutoAttack
1114
from art.attacks.evasion.auto_projected_gradient_descent import AutoProjectedGradientDescent
12-
from art.attacks.evasion.brendel_bethge import BrendelBethgeAttack
15+
16+
if importlib.util.find_spec("numba") is not None:
17+
from art.attacks.evasion.brendel_bethge import BrendelBethgeAttack
18+
1319
from art.attacks.evasion.boundary import BoundaryAttack
1420
from art.attacks.evasion.carlini import CarliniL2Method, CarliniLInfMethod, CarliniL0Method
1521
from art.attacks.evasion.decision_tree_attack import DecisionTreeAttack

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"six",
1414
"setuptools",
1515
"tqdm",
16-
"numba>=0.53.1",
1716
]
1817

1918
docs_require = [
@@ -93,6 +92,7 @@ def get_version(rel_path):
9392
"cma",
9493
"librosa",
9594
"opencv-python",
95+
"numba",
9696
],
9797
"non_framework": [
9898
"matplotlib",
@@ -112,6 +112,7 @@ def get_version(rel_path):
112112
"codecov",
113113
"requests",
114114
"sortedcontainers",
115+
"numba",
115116
],
116117
},
117118
classifiers=[

0 commit comments

Comments
 (0)