Merge remote-tracking branch 'origin' into dev_1.19.2

beat-buesser · beat-buesser · commit a5f275968bb8 · 2025-06-13T11:03:24.000+02:00
diff --git a/.github/workflows/ci-deepspeech-v3.yml b/.github/workflows/ci-deepspeech-v3.yml
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-espresso.yml b/.github/workflows/ci-espresso.yml
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-goturn.yml b/.github/workflows/ci-goturn.yml
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-huggingface.yml b/.github/workflows/ci-huggingface.yml
@@ -61,13 +61,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-keras.yml b/.github/workflows/ci-keras.yml
@@ -69,13 +69,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-legacy.yml b/.github/workflows/ci-legacy.yml
@@ -64,13 +64,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-pytorch-object-detectors.yml b/.github/workflows/ci-pytorch-object-detectors.yml
@@ -45,13 +45,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-pytorch.yml b/.github/workflows/ci-pytorch.yml
@@ -34,12 +34,12 @@ jobs:
             torch: 2.6.0
             torchvision: 0.21.0
             torchaudio: 2.6.0
-          - name: PyTorch 2.7.0 (Python 3.10)
+          - name: PyTorch 2.7.1 (Python 3.10)
             framework: pytorch
             python: '3.10'
-            torch: 2.7.0
-            torchvision: 0.22.0
-            torchaudio: 2.7.0
+            torch: 2.7.1
+            torchvision: 0.22.1
+            torchaudio: 2.7.1
 
     name: ${{ matrix.name }}
     steps:
@@ -64,13 +64,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-scikit-learn.yml b/.github/workflows/ci-scikit-learn.yml
@@ -57,13 +57,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-tensorflow-v1.yml b/.github/workflows/ci-tensorflow-v1.yml
@@ -48,7 +48,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 '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d;/^timm/d;/^types-six/d' requirements_test.txt)
+          pip install -q -r <(sed '/^pandas/d;/^scipy/d;/^matplotlib/d;/^xgboost/d;/^tensorflow/d;/^keras/d;/^jax/d;/^torch/d;/^Pillow/d;/^h5py/d;/^kornia/d;/^scikit-learn/d;/^pytest-mock/d;/^GPy/d;/^lief/d;/^statsmodels/d;/^ultralytics/d;/^ipython/d;/^numba/d;/^pytest/d;/^pylint/d;/^mypy/d;/^pycodestyle/d;/^black/d;/^types-PyYAML/d;/^types-setuptools/d;/^requests/d;/^timm/d;/^types-six/d;/^catboost/d;/^tensorboardX/d' requirements_test.txt)
           pip install pandas==1.3.5
           pip install scipy==1.7.2
           pip install matplotlib==3.5.3
@@ -74,6 +74,8 @@ jobs:
           pip install requests==2.31.0
           pip install timm==0.9.12
           pip install types-six==1.16.21.9
+          pip install catboost==1.2.7
+          pip install tensorboardX==2.6.2.2
           pip list
       - name: Run Tests
         run: ./run_tests.sh ${{ matrix.framework }}
diff --git a/.github/workflows/ci-tensorflow-v2.yml b/.github/workflows/ci-tensorflow-v2.yml
@@ -65,13 +65,13 @@ jobs:
           pip list
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-tfv2-faster-rcnn.yml b/.github/workflows/ci-tfv2-faster-rcnn.yml
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/.github/workflows/ci-yolo.yml b/.github/workflows/ci-yolo.yml
@@ -31,13 +31,13 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache CIFAR-10 dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/cifar-10-batches-py
           key: cifar10-dataset-cache-v1
 
       - name: Cache MNIST dataset
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.art/data/mnist.npz
           key: mnist-dataset-cache-v1
diff --git a/art/attacks/evasion/adversarial_patch/adversarial_patch_pytorch.py b/art/attacks/evasion/adversarial_patch/adversarial_patch_pytorch.py
@@ -658,9 +658,10 @@ def __getitem__(self, idx):
 
             # Write summary
             if self.summary_writer is not None:  # pragma: no cover
+                mask_tensor = torch.from_numpy(mask).to(self.estimator.device)
                 x_patched = (
                     self._random_overlay(
-                        images=torch.from_numpy(x).to(self.estimator.device), patch=self._patch, mask=mask
+                        images=torch.from_numpy(x).to(self.estimator.device), patch=self._patch, mask=mask_tensor
                     )
                     .detach()
                     .cpu()
diff --git a/art/attacks/evasion/fast_gradient.py b/art/attacks/evasion/fast_gradient.py
@@ -126,7 +126,7 @@ def _check_compatibility_input_and_eps(self, x: np.ndarray):
             if self.eps.ndim > x.ndim:  # pragma: no cover
                 raise ValueError("The `eps` shape must be broadcastable to input shape.")
 
-    def _minimal_perturbation(self, x: np.ndarray, y: np.ndarray, mask: np.ndarray) -> np.ndarray:
+    def _minimal_perturbation(self, x: np.ndarray, y: np.ndarray, mask: np.ndarray | None) -> np.ndarray:
         """
         Iteratively compute the minimal perturbation necessary to make the class prediction change. Stop when the
         first adversarial example was found.
@@ -591,7 +591,7 @@ def _compute(
         return x_adv
 
     @staticmethod
-    def _get_mask(x: np.ndarray, **kwargs) -> np.ndarray:
+    def _get_mask(x: np.ndarray, **kwargs) -> np.ndarray | None:
         """
         Get the mask from the kwargs.
 
@@ -602,7 +602,7 @@ def _get_mask(x: np.ndarray, **kwargs) -> np.ndarray:
         :type mask: `np.ndarray`
         :return: The mask.
         """
-        mask = kwargs.get("mask")
+        mask: np.ndarray | None = kwargs.get("mask")
 
         if mask is not None:
             if mask.ndim > x.ndim:  # pragma: no cover
diff --git a/art/attacks/evasion/graphite/graphite_blackbox.py b/art/attacks/evasion/graphite/graphite_blackbox.py
@@ -245,6 +245,9 @@ def generate(self, x: np.ndarray, y: np.ndarray | None = None, **kwargs) -> np.n
         # target initialization image
         x_tar = kwargs.get("x_tar")
 
+        if x_tar is None:
+            raise ValueError("x_tar is None. Please provide x_tar as initial array to act as the example target image.")
+
         # Some initial setups
         x_adv = x.astype(ART_NUMPY_DTYPE)
 
diff --git a/art/attacks/evasion/pe_malware_attack.py b/art/attacks/evasion/pe_malware_attack.py
@@ -752,7 +752,6 @@ def insert_section(
                     lief.PE.SECTION_TYPES.RELOCATION,
                     lief.PE.SECTION_TYPES.RESOURCE,
                     lief.PE.SECTION_TYPES.TEXT,
-                    lief.PE.SECTION_TYPES.TLS_,
                     lief.PE.SECTION_TYPES.UNKNOWN,
                 ]
             ),
diff --git a/art/attacks/evasion/shadow_attack.py b/art/attacks/evasion/shadow_attack.py
@@ -243,7 +243,7 @@ def _get_regularisation_loss_gradients(self, perturbation: np.ndarray) -> np.nda
             loss_c = perturbation_t.abs().mean([2, 3]).norm(dim=1) ** 2
             loss = torch.mean(self.lambda_tv * loss_tv + self.lambda_s * loss_s + self.lambda_c * loss_c)
             loss.backward()
-            gradients = perturbation_t.grad.numpy()
+            gradients = perturbation_t.grad.numpy()  # type: ignore
         else:
             raise NotImplementedError
 
diff --git a/art/attacks/poisoning/gradient_matching_attack.py b/art/attacks/poisoning/gradient_matching_attack.py
@@ -499,7 +499,7 @@ def __len__(self):
                 sum_loss += loss.clone().cpu().detach().numpy()
                 count += 1
             if self.verbose > 0:
-                epoch_iterator.set_postfix(loss=sum_loss / count)
+                epoch_iterator.set_postfix(loss=sum_loss / count)  # type: ignore
             self.lr_schedule.step()
 
         B_sum = 0  # pylint: disable=invalid-name
diff --git a/art/defences/trainer/certified_adversarial_trainer_pytorch.py b/art/defences/trainer/certified_adversarial_trainer_pytorch.py
@@ -221,10 +221,11 @@ def fit(
         y = check_and_transform_label_format(y, nb_classes=self.classifier.nb_classes)
 
         # Apply preprocessing
+        y_preprocessed: np.ndarray
         x_preprocessed, y_preprocessed = self.classifier.apply_preprocessing(x, y, fit=True)
 
         # Check label shape
-        y_preprocessed = self.classifier.reduce_labels(y_preprocessed)
+        y_preprocessed = self.classifier.reduce_labels(y_preprocessed)  # type: ignore
 
         num_batch = int(np.ceil(len(x_preprocessed) / float(self.pgd_params["batch_size"])))
         ind = np.arange(len(x_preprocessed)).tolist()
@@ -268,8 +269,8 @@ def fit(
                 for i, (sample, label) in enumerate(zip(x_cert, y_cert)):
 
                     self.set_forward_mode("concrete")
-                    concrete_pred = self.classifier.model.forward(np.expand_dims(sample, axis=0))
-                    concrete_pred = torch.argmax(concrete_pred)
+                    concrete_pred_tensor = self.classifier.model.forward(np.expand_dims(sample, axis=0))
+                    concrete_pred = int(torch.argmax(concrete_pred_tensor).item())
 
                     if self.classifier.concrete_to_zonotope is None:
                         if sys.version_info >= (3, 8):
diff --git a/art/defences/trainer/ibp_certified_trainer_pytorch.py b/art/defences/trainer/ibp_certified_trainer_pytorch.py
@@ -378,7 +378,7 @@ def fit(
                         max_iter=self.pgd_params["max_iter"],
                         num_random_init=self.pgd_params["num_random_init"],
                     )
-                    i_batch = self.attack.generate(i_batch, y=o_batch)
+                    i_batch = self.attack.generate(i_batch, y=o_batch)  # type: ignore
                     self.classifier.model.zero_grad()
                 else:
                     i_batch = np.copy(x_preprocessed[ind[m * batch_size : (m + 1) * batch_size]]).astype("float32")
diff --git a/art/estimators/certification/interval/interval.py b/art/estimators/certification/interval/interval.py
@@ -201,7 +201,7 @@ def re_convert(self, device: str | "torch.device") -> None:
         if self.bias is not None:
             self.bias = self.bias.to(device)
 
-    def convert_to_dense(self, device: str | "torch.device") -> tuple["torch.Tensor", "torch.Tensor"]:
+    def convert_to_dense(self, device: str | "torch.device") -> tuple["torch.Tensor", "torch.Tensor" | None]:
         """
         Converts the initialised convolutional layer into an equivalent dense layer.
 
@@ -283,6 +283,9 @@ def forward(self, x: "torch.Tensor") -> "torch.Tensor":
         :param x: interval representation of the datapoint.
         :return: output of the convolutional layer on x
         """
+        if self.bias is None:
+            raise ValueError("self.bias is None, therefore this function cannot calculate the forward pass.")
+
         x = torch.reshape(x, (x.shape[0], 2, -1))
 
         center = (x[:, 1] + x[:, 0]) / 2
diff --git a/art/estimators/certification/object_seeker/pytorch.py b/art/estimators/certification/object_seeker/pytorch.py
@@ -351,7 +351,7 @@ def loss_gradient(
         """
         return self.detector.loss_gradient(
             x=x,
-            y=y,
+            y=y,  # type: ignore
             **kwargs,
         )
 
diff --git a/art/estimators/certification/randomized_smoothing/pytorch.py b/art/estimators/certification/randomized_smoothing/pytorch.py
@@ -241,7 +241,7 @@ def predict(  # type: ignore
 
     def loss_gradient(  # type: ignore
         self, x: np.ndarray, y: np.ndarray, training_mode: bool = False, **kwargs
-    ) -> np.ndarray:
+    ) -> np.ndarray | "torch.Tensor":
         """
         Compute the gradient of the loss function w.r.t. `x`.
 
diff --git a/art/estimators/object_detection/pytorch_object_detector.py b/art/estimators/object_detection/pytorch_object_detector.py
diff --git a/art/estimators/object_tracking/pytorch_goturn.py b/art/estimators/object_tracking/pytorch_goturn.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements_test.txt b/requirements_test.txt
