Merge branch 'dev_1.10.1' into development_issue_1609

beat-buesser · web-flow · commit b630aae0b26b · 2022-04-19T15:49:28.000+01:00
diff --git a/.github/workflows/ci-deepspeech-v2.yml b/.github/workflows/ci-deepspeech-v2.yml
@@ -29,6 +29,6 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/deepspeech-v2
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-deepspeech-v3.yml b/.github/workflows/ci-deepspeech-v3.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/deepspeech-v3
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
   test_deepspeech_v3_torch_1_10:
@@ -42,6 +42,6 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/deepspeech-v3
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-espresso.yml b/.github/workflows/ci-espresso.yml
@@ -29,6 +29,6 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/espresso
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-goturn.yml b/.github/workflows/ci-goturn.yml
@@ -29,6 +29,6 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/goturn
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-keras.yml b/.github/workflows/ci-keras.yml
@@ -71,6 +71,6 @@ jobs:
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-legacy.yml b/.github/workflows/ci-legacy.yml
@@ -60,6 +60,6 @@ jobs:
       - name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
         run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-lingvo.yml b/.github/workflows/ci-lingvo.yml
@@ -47,7 +47,7 @@ jobs:
           sudo apt-get update
           sudo apt-get -y -q install ffmpeg libavcodec-extra
           python -m pip install --upgrade pip setuptools wheel
-          pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^h5py/d;/^Pillow/d;/^pytest-mock/d' requirements_test.txt)
+          pip install -q -r <(sed '/^scipy/d;/^matplotlib/d;/^pandas/d;/^statsmodels/d;/^numba/d;/^jax/d;/^h5py/d;/^Pillow/d;/^pytest/d;/^pytest-mock/d;/^torch/d;/^torchaudio/d;/^torchvision/d' requirements_test.txt)
           pip install scipy==1.5.4
           pip install matplotlib==3.3.4
           pip install pandas==1.1.5
@@ -60,11 +60,17 @@ jobs:
           pip install model-pruning-google-research==0.0.3
           pip install jax[cpu]==0.2.17
           pip install h5py==2.10.0
+          pip install pytest~=7.0.1
+          pip install pytest-flake8~=1.1.0
           pip install pytest-mock
+          pip install pytest-cov~=3.0.0
+          pip install torch==1.10.2+cpu --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchaudio==0.10.2+cpu --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchvision==0.11.3+cpu --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
           pip list
       - name: Run ${{ matrix.name }} Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-mxnet.yml b/.github/workflows/ci-mxnet.yml
@@ -49,6 +49,6 @@ jobs:
       - name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
         run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-pytorch-object-detectors.yml b/.github/workflows/ci-pytorch-object-detectors.yml
@@ -48,6 +48,6 @@ jobs:
       - name: Run Test Action - test_pytorch_faster_rcnn
         run: pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_detection/test_pytorch_faster_rcnn.py --framework=pytorch --durations=0
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-pytorch.yml b/.github/workflows/ci-pytorch.yml
@@ -25,12 +25,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: PyTorch 1.8.1 (Python 3.8)
-            framework: pytorch
-            python: 3.8
-            torch: 1.8.1+cpu
-            torchvision: 0.9.1+cpu
-            torchaudio: 0.8.1
           - name: PyTorch 1.9.1 (Python 3.8)
             framework: pytorch
             python: 3.8
@@ -43,6 +37,12 @@ jobs:
             torch: 1.10.2+cpu
             torchvision: 0.11.3+cpu
             torchaudio: 0.10.2+cpu
+          - name: PyTorch 1.11.0 (Python 3.8)
+            framework: pytorch
+            python: 3.8
+            torch: 1.11.0+cpu
+            torchvision: 0.12.0+cpu
+            torchaudio: 0.11.0
 
     name: ${{ matrix.name }}
     steps:
@@ -67,6 +67,6 @@ jobs:
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-scikit-learn.yml b/.github/workflows/ci-scikit-learn.yml
@@ -59,6 +59,6 @@ jobs:
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-tensorflow-v1.yml b/.github/workflows/ci-tensorflow-v1.yml
@@ -54,6 +54,6 @@ jobs:
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-tensorflow-v2.yml b/.github/workflows/ci-tensorflow-v2.yml
@@ -68,6 +68,6 @@ jobs:
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci-tf-faster-rcnn.yml b/.github/workflows/ci-tf-faster-rcnn.yml
@@ -29,6 +29,6 @@ jobs:
       - name: Run Test Action
         uses: ./.github/actions/tf-faster-rcnn
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: true
diff --git a/art/attacks/evasion/adversarial_patch/adversarial_patch_pytorch.py b/art/attacks/evasion/adversarial_patch/adversarial_patch_pytorch.py
@@ -683,7 +683,10 @@ def apply_patch(
             mask = mask.copy()
         mask = self._check_mask(mask=mask, x=x)
         x_tensor = torch.Tensor(x)
-        mask_tensor = torch.Tensor(mask)
+        if mask is not None:
+            mask_tensor = torch.Tensor(mask)
+        else:
+            mask_tensor = None
         if isinstance(patch_external, np.ndarray):
             patch_tensor = torch.Tensor(patch_external)
         else:
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -5,14 +5,14 @@ scipy==1.8.0
 matplotlib==3.5.1
 scikit-learn>=0.22.2,<1.1.0
 six==1.16.0
-Pillow==9.0.1
-tqdm==4.63.0
+Pillow==9.1.0
+tqdm==4.64.0
 statsmodels==0.13.2
 pydub==0.25.1
 resampy==0.2.2
 ffmpeg-python==0.2.0
-cma==3.2.1
-pandas==1.4.1
+cma==3.2.2
+pandas==1.4.2
 librosa==0.9.1
 numba~=0.55.1
 opencv-python
@@ -30,19 +30,19 @@ mxnet-native==1.8.0.post0
 
 # PyTorch
 --find-links https://download.pytorch.org/whl/cpu/torch_stable.html
-torch==1.10.2+cpu
-torchaudio==0.10.2+cpu
-torchvision==0.11.3+cpu
+torch==1.11.0
+torchaudio==0.11.0+cpu
+torchvision==0.12.0+cpu
 
-catboost==1.0.4
+catboost==1.0.5
 GPy==1.10.0
 lightgbm==3.3.2
 xgboost==1.5.2
 
-kornia~=0.6.3
+kornia~=0.6.4
 tensorboardX==2.5
-lief==0.11.5
-jax[cpu]==0.3.4
+lief==0.12.0
+jax[cpu]==0.3.5
 
 # Lingvo ASR dependencies
 # supported versions: (lingvo==0.6.4 with tensorflow-gpu==2.1.0)
@@ -51,8 +51,8 @@ jax[cpu]==0.3.4
 # lingvo==0.6.4
 
 # other
-pytest~=7.0.1
-pytest-flake8~=1.1.0
+pytest~=7.1.1
+pytest-flake8~=1.1.1
 pytest-mock~=3.7.0
 pytest-cov~=3.0.0
 codecov~=2.1.12
