Merge branch 'dev_1.5.1' into development_maintenance_151

Author: ebubae

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ on:
 
   # Run scheduled CI flow daily
   schedule:
-    - cron: '0 8 * * *'
+    - cron: '0 8 * * 0'
 
 jobs:
   test:

README-cn.md

@@ -7,7 +7,7 @@
 ![Continuous Integration](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/Continuous%20Integration/badge.svg)
 ![CodeQL](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/CodeQL/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/adversarial-robustness-toolbox/badge/?version=latest)](http://adversarial-robustness-toolbox.readthedocs.io/en/latest/?badge=latest)
-[![GitHub version](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox.svg)](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox)
+[![PyPI](https://badge.fury.io/py/adversarial-robustness-toolbox.svg)](https://badge.fury.io/py/adversarial-robustness-toolbox)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/context:python)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/alerts/)
 [![codecov](https://codecov.io/gh/Trusted-AI/adversarial-robustness-toolbox/branch/master/graph/badge.svg)](https://codecov.io/gh/Trusted-AI/adversarial-robustness-toolbox)

README.md

@@ -7,7 +7,7 @@
 ![Continuous Integration](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/Continuous%20Integration/badge.svg)
 ![CodeQL](https://github.com/Trusted-AI/adversarial-robustness-toolbox/workflows/CodeQL/badge.svg)
 [![Documentation Status](https://readthedocs.org/projects/adversarial-robustness-toolbox/badge/?version=latest)](http://adversarial-robustness-toolbox.readthedocs.io/en/latest/?badge=latest)
-[![GitHub version](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox.svg)](https://badge.fury.io/gh/Trusted-AI%2Fadversarial-robustness-toolbox)
+[![PyPI](https://badge.fury.io/py/adversarial-robustness-toolbox.svg)](https://badge.fury.io/py/adversarial-robustness-toolbox)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/context:python)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/Trusted-AI/adversarial-robustness-toolbox.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Trusted-AI/adversarial-robustness-toolbox/alerts/)
 [![codecov](https://codecov.io/gh/Trusted-AI/adversarial-robustness-toolbox/branch/master/graph/badge.svg)](https://codecov.io/gh/Trusted-AI/adversarial-robustness-toolbox)

art/attacks/evasion/projected_gradient_descent/projected_gradient_descent_pytorch.py

@@ -238,9 +238,11 @@ def _generate_batch(
         :param eps_step: Attack step size (input variation) at each iteration.
         :return: Adversarial examples.
         """
+        import torch  # lgtm [py/repeated-import]
+
         inputs = x.to(self.estimator.device)
         targets = targets.to(self.estimator.device)
-        adv_x = inputs
+        adv_x = torch.clone(inputs)
 
         if mask is not None:
             mask = mask.to(self.estimator.device)

art/attacks/evasion/projected_gradient_descent/projected_gradient_descent_tensorflow_v2.py

@@ -234,7 +234,10 @@ def _generate_batch(
         :param eps_step: Attack step size (input variation) at each iteration.
         :return: Adversarial examples.
         """
-        adv_x = x
+        import tensorflow as tf  # lgtm [py/repeated-import]
+
+        adv_x = tf.identity(x)
+
         for i_max_iter in range(self.max_iter):
             adv_x = self._compute_tf(
                 adv_x, x, targets, mask, eps, eps_step, self.num_random_init > 0 and i_max_iter == 0,

art/estimators/classification/keras.py

@@ -630,7 +630,10 @@ def custom_loss_gradient(self, nn_function, tensors, input_values, name="default
         :return: the gradient of the function w.r.t vars
         :rtype: `np.ndarray`
         """
-        import keras.backend as k
+        if self.is_tensorflow:
+            import tensorflow.keras.backend as k
+        else:
+            import keras.backend as k
 
         if not hasattr(self, "_custom_loss_func"):
             self._custom_loss_func = {}

requirements.txt

@@ -2,7 +2,7 @@
 numpy==1.19.2
 scipy==1.4.1
 matplotlib==3.3.3
-scikit-learn>=0.22.2
+scikit-learn>=0.22.2,==0.23.*
 six==1.15.0
 Pillow==7.2.0
 tqdm==4.49.0
@@ -18,7 +18,7 @@ h5py==2.10.0
 # supported versions: (tensorflow==2.2.0 with keras==2.3.1) or (tensorflow==1.15.4 with keras==2.2.5)
 tensorflow>=1.15.4
 keras>=2.2.5
-tensorflow-addons>=0.11.2
+tensorflow-addons~=0.11.0
 mxnet==1.6.0
 --find-links https://download.pytorch.org/whl/torch_stable.html
 torch==1.6.0

setup.py

@@ -10,7 +10,7 @@
     "numpy",
     "scipy>=1.4.1",
     "matplotlib",
-    "scikit-learn>=0.22.2",
+    "scikit-learn>=0.22.2,==0.23.*",
     "six",
     "setuptools",
     "Pillow",
@@ -32,7 +32,7 @@
     "numpy",
     "scipy>=1.4.1",
     "six>=1.13.0",
-    "scikit-learn>=0.22.2",
+    "scikit-learn>=0.22.2,==0.23.*",
     "Pillow>=6.0.0",
 ]
 

tests/attacks/test_copycat_cnn.py

@@ -47,7 +47,7 @@
 
 logger = logging.getLogger(__name__)
 
-NB_EPOCHS = 10
+NB_EPOCHS = 20
 NB_STOLEN = 1000