Merge branch 'main' into dependabot/pip/scipy-1.7.2

Author: beat-buesser

.github/workflows/ci-legacy.yml

@@ -26,14 +26,14 @@ jobs:
       matrix:
         module: [attacks_1, attacks_2, estimators, defences, metrics, art]
         include:
-          - name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.9.1 scikit-learn 0.24.2 Python 3.8)
+          - name: legacy (TensorFlow 2.6.0 Keras 2.6.0 PyTorch 1.10.0 scikit-learn 0.24.2 Python 3.8)
             framework: legacy
             python: 3.8
             tensorflow: 2.6.0
             keras: 2.6.0
-            torch: 1.9.1+cpu
-            torchvision: 0.10.1+cpu
-            torchaudio: 0.9.1
+            torch: 1.10.0+cpu
+            torchvision: 0.11.1+cpu
+            torchaudio: 0.10.0
             scikit-learn: 0.24.2
 
     name: Run ${{ matrix.module }} ${{ matrix.name }} Tests
@@ -53,9 +53,9 @@ jobs:
           pip install tensorflow==${{ matrix.tensorflow }}
           pip install keras==${{ matrix.keras }}
           pip install scikit-learn==${{ matrix.scikit-learn }}
-          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/torch_stable.html
+          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
           pip list
       - name: Run ${{ matrix.name }} ${{ matrix.module }} Tests
         run: ./run_tests.sh ${{ matrix.framework }} ${{ matrix.module }}

.github/workflows/ci-pytorch-object-detectors.yml

@@ -40,9 +40,9 @@ jobs:
           pip list
       - name: Pre-install torch
         run: |
-          pip install torch==1.6.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchvision==0.7.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchaudio==0.6.0 -f https://download.pytorch.org/whl/torch_stable.html
+          pip install torch==1.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchvision==0.11.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
       - name: Run Test Action - test_pytorch_object_detector
         run: pytest --cov-report=xml --cov=art --cov-append -q -vv tests/estimators/object_detection/test_pytorch_object_detector.py --framework=pytorch --durations=0
       - name: Run Test Action - test_pytorch_faster_rcnn

.github/workflows/ci-pytorch.yml

@@ -37,6 +37,12 @@ jobs:
             torch: 1.9.1+cpu
             torchvision: 0.10.1+cpu
             torchaudio: 0.9.1
+          - name: PyTorch 1.10.0 (Python 3.7)
+            framework: pytorch
+            python: 3.7
+            torch: 1.10.0+cpu
+            torchvision: 0.11.1+cpu
+            torchaudio: 0.10.0
 
     name: ${{ matrix.name }}
     steps:
@@ -54,9 +60,9 @@ jobs:
           pip3 install -r requirements.txt
           pip install tensorflow==2.4.3
           pip install keras==2.4.3
-          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/torch_stable.html
-          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/torch_stable.html
+          pip install torch==${{ matrix.torch }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchvision==${{ matrix.torchvision }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
+          pip install torchaudio==${{ matrix.torchaudio }} -f https://download.pytorch.org/whl/cpu/torch_stable.html
           pip list
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}

art/defences/preprocessor/mp3_compression_pytorch.py

@@ -88,7 +88,7 @@ def __init__(
             verbose=verbose,
         )
 
-        class CompressionPyTorchNumpy(Function):
+        class CompressionPyTorchNumpy(Function):  # pylint: disable=W0223
             """
             Function running Preprocessor.
             """

art/defences/preprocessor/video_compression_pytorch.py

@@ -96,7 +96,7 @@ def __init__(
             verbose=verbose,
         )
 
-        class CompressionPyTorchNumpy(Function):
+        class CompressionPyTorchNumpy(Function):  # pylint: disable=W0223
             """
             Function running Preprocessor.
             """

requirements.txt

@@ -25,10 +25,11 @@ keras>=2.2.5
 tensorflow-addons>=0.13.0
 # using mxnet-native for reproducible test results on CI machines without Intel Architecture Processors, but mxnet is fully supported by ART
 mxnet-native==1.8.0.post0
---find-links https://download.pytorch.org/whl/torch_stable.html
-torch==1.8.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
-torchaudio==0.8.1 -f https://download.pytorch.org/whl/torch_stable.html
-torchvision==0.9.1 -f https://download.pytorch.org/whl/torch_stable.html
+--find-links https://download.pytorch.org/whl/cpu/torch_stable.html
+
+torch==1.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
+torchaudio==0.10.0+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
+torchvision==0.11.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
 catboost==1.0.0
 GPy==1.10.0
 lightgbm==3.3.0

tests/estimators/object_detection/test_pytorch_object_detector.py

@@ -111,7 +111,7 @@ def test_predict_2(self):
 
         self.assertTrue(result[0]["scores"].shape == (4,))
         expected_detection_scores = np.asarray([0.45197296, 0.12707493, 0.082677, 0.05386855])
-        np.testing.assert_array_almost_equal(result[0]["scores"][:10], expected_detection_scores, decimal=6)
+        np.testing.assert_array_almost_equal(result[0]["scores"][:10], expected_detection_scores, decimal=4)
 
         self.assertTrue(result[0]["labels"].shape == (4,))
         expected_detection_classes = np.asarray([72, 72, 1, 1])