Updating patch attacks based on convo with Beat

Author: stekunda

art/attacks/evasion/adversarial_patch/adversarial_patch_pytorch.py

@@ -511,13 +511,13 @@ def generate(  # type: ignore
         if self.patch_location is not None and mask is not None:
             raise ValueError("Masks can only be used if the `patch_location` is `None`.")
 
+        if y is None and self.targeted:
+                raise ValueError("The targeted version of AdversarialPatch attack requires provided target labels.")
+
         if hasattr(self.estimator, "nb_classes"):
 
             y_array: np.ndarray
 
-            if y is not None and not self.targeted:
-                raise ValueError("The untargeted version of AdversarialPatch attack does not use target labels.")
-
             if y is None:  # pragma: no cover
                 logger.info("Setting labels to estimator classification predictions.")
                 y_array = to_categorical(
@@ -536,9 +536,6 @@ def generate(  # type: ignore
             else:
                 self.use_logits = True
         else:
-            if y is not None and not self.targeted:
-                raise ValueError("The untargeted version of AdversarialPatch attack does not use target labels.")
-
             if y is None:  # pragma: no cover
                 logger.info("Setting labels to estimator object detection predictions.")
                 y = self.estimator.predict(x=x)

art/attacks/evasion/dpatch_robust.py

@@ -155,7 +155,7 @@ def generate(  # type: ignore
         if y is None and self.targeted:
             raise ValueError("The targeted version of RobustDPatch attack requires target labels provided to `y`.")
         if y is not None and not self.targeted:
-            raise ValueError("The RobustDPatch attack does not use target labels.")
+            raise ValueError("The untargeted version of RobustDPatch attack does not use target labels provided to 'y'.")
         if x.ndim != 4:  # pragma: no cover
             raise ValueError("The adversarial patch can only be applied to images.")