Set default normalize as None in top-level attacks

spencerwooo · Nov 21, 2024 · 3e5d623 · 3e5d623
1 parent 2bd000a
commit 3e5d623
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 23 deletions.
diff --git a/torchattack/_attack.py b/torchattack/_attack.py
@@ -28,6 +28,10 @@ def __init__(
         # If normalize is None, use identity function
         self.normalize = normalize if normalize else lambda x: x
 
+    @abstractmethod
+    def forward(self, *args: Any, **kwds: Any):
+        pass
+
     def __call__(self, *args: Any, **kwds: Any) -> Any:
         return self.forward(*args, **kwds)
 
@@ -46,6 +50,30 @@ def repr_map(k, v):
         args = ', '.join(repr_map(k, v) for k, v in self.__dict__.items())
         return f'{name}({args})'
 
-    @abstractmethod
-    def forward(self, *args: Any, **kwds: Any):
-        pass
+    def __eq__(self, other):
+        if not isinstance(other, Attack):
+            return False
+
+        eq_name_attrs = [
+            'model',
+            'normalize',
+            'lossfn',
+            'feature_layer',  # FIA
+            'hooks',  # PNAPatchOut, TGR, VDC
+            'perceptual_criteria',  # SSP
+            'sub_basis',  # GeoDA
+        ]
+        for attr in eq_name_attrs:
+            if not (hasattr(self, attr) and hasattr(other, attr)):
+                continue
+            if (
+                getattr(self, attr).__class__.__name__
+                != getattr(other, attr).__class__.__name__
+            ):
+                return False
+
+        return all(
+            getattr(self, attr) == getattr(other, attr)
+            for attr in self.__dict__
+            if attr not in eq_name_attrs
+        )
diff --git a/torchattack/admix.py b/torchattack/admix.py
@@ -32,7 +32,7 @@ class Admix(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/decowa.py b/torchattack/decowa.py
@@ -35,7 +35,7 @@ class DeCoWA(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/deepfool.py b/torchattack/deepfool.py
@@ -27,7 +27,7 @@ class DeepFool(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         steps: int = 100,
         overshoot: float = 0.02,

diff --git a/torchattack/difgsm.py b/torchattack/difgsm.py
@@ -38,7 +38,7 @@ class DIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/fgsm.py b/torchattack/fgsm.py
@@ -26,7 +26,7 @@ class FGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         clip_min: float = 0.0,

diff --git a/torchattack/fia.py b/torchattack/fia.py
@@ -32,7 +32,7 @@ class FIA(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/geoda.py b/torchattack/geoda.py
@@ -96,7 +96,7 @@ class GeoDA(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         input_shape: tuple = (3, 224, 224),
         epsilon: int = 5,

diff --git a/torchattack/mifgsm.py b/torchattack/mifgsm.py
@@ -29,7 +29,7 @@ class MIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/nifgsm.py b/torchattack/nifgsm.py
@@ -33,7 +33,7 @@ class NIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/pgd.py b/torchattack/pgd.py
@@ -29,7 +29,7 @@ class PGD(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/pgdl2.py b/torchattack/pgdl2.py
@@ -31,7 +31,7 @@ class PGDL2(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 1.0,
         steps: int = 10,

diff --git a/torchattack/pna_patchout.py b/torchattack/pna_patchout.py
@@ -39,7 +39,7 @@ class PNAPatchOut(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         model_name: str = '',
         eps: float = 8 / 255,

diff --git a/torchattack/sinifgsm.py b/torchattack/sinifgsm.py
@@ -30,7 +30,7 @@ class SINIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/ssa.py b/torchattack/ssa.py
@@ -32,7 +32,7 @@ class SSA(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/ssp.py b/torchattack/ssp.py
@@ -50,7 +50,7 @@ class SSP(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 100,

diff --git a/torchattack/tgr.py b/torchattack/tgr.py
@@ -39,7 +39,7 @@ class TGR(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         model_name: str = '',
         eps: float = 8 / 255,

diff --git a/torchattack/tifgsm.py b/torchattack/tifgsm.py
@@ -38,7 +38,7 @@ class TIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/vdc.py b/torchattack/vdc.py
@@ -40,7 +40,7 @@ class VDC(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         model_name: str = '',
         eps: float = 8 / 255,

diff --git a/torchattack/vmifgsm.py b/torchattack/vmifgsm.py
@@ -37,7 +37,7 @@ class VMIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,

diff --git a/torchattack/vnifgsm.py b/torchattack/vnifgsm.py
@@ -36,7 +36,7 @@ class VNIFGSM(Attack):
     def __init__(
         self,
         model: nn.Module | AttackModel,
-        normalize: Callable[[torch.Tensor], torch.Tensor] | None,
+        normalize: Callable[[torch.Tensor], torch.Tensor] | None = None,
         device: torch.device | None = None,
         eps: float = 8 / 255,
         steps: int = 10,