Merge branch 'master' of github.com:bethgelab/foolbox

bethgelab · Jul 13, 2017 · e767c1b · e767c1b
2 parents 7bbbecc + 0236724
commit e767c1b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/foolbox/attacks/lbfgs.py b/foolbox/attacks/lbfgs.py
@@ -112,7 +112,7 @@ def _optimize(self, a, target_class, epsilon, maxiter, verbose):
 
         # store the shape for later and operate on the flattened image
         shape = image.shape
-        # dtype = image.dtype
+        dtype = image.dtype
         image = image.flatten().astype(np.float64)
 
         n = len(image)
@@ -134,9 +134,10 @@ def crossentropy(x):
                 return ce
 
             def loss(x, c):
+                x = x.astype(dtype)
                 v1 = distance(x)
                 v2 = crossentropy(x)
-                return v1 + c * v2
+                return np.float64(v1 + c * v2)
 
         else:
 
@@ -152,13 +153,14 @@ def crossentropy(x):
                 return ce, gradient
 
             def loss(x, c):
+                x = x.astype(dtype)
                 v1, g1 = distance(x)
                 v2, g2 = crossentropy(x)
                 v = v1 + c * v2
                 g = g1 + c * g2
 
                 a = 1e10
-                return a * v, a * g
+                return np.float64(a * v), np.float64(a * g)
 
         def lbfgsb(c):
             approx_grad_eps = (max_ - min_) / 100
@@ -174,7 +176,7 @@ def lbfgsb(c):
 
             logging.info(d)
 
-            _, is_adversarial = a.predictions(x.reshape(shape))
+            _, is_adversarial = a.predictions(x.reshape(shape).astype(dtype))
             return is_adversarial
 
         # finding initial c

diff --git a/foolbox/tests/conftest.py b/foolbox/tests/conftest.py
@@ -97,6 +97,7 @@ def bn_model_pytorch():
     class Net(nn.Module):
 
         def forward(self, x):
+            assert isinstance(x.data, torch.FloatTensor)
             x = torch.mean(x, 3)
             x = torch.squeeze(x, dim=3)
             x = torch.mean(x, 2)
@@ -238,3 +239,12 @@ def bn_adversarial_pytorch():
     image = bn_image_pytorch()
     label = bn_label()
     return Adversarial(model, criterion, image, label)
+
+
+@pytest.fixture
+def bn_targeted_adversarial_pytorch():
+    model = bn_model_pytorch()
+    criterion = bn_targeted_criterion()
+    image = bn_image_pytorch()
+    label = bn_label()
+    return Adversarial(model, criterion, image, label)
diff --git a/foolbox/tests/test_attacks_lbfgs.py b/foolbox/tests/test_attacks_lbfgs.py
@@ -33,3 +33,11 @@ def test_attack_pytorch(bn_adversarial_pytorch):
     attack(adv, verbose=True, num_random_targets=2)
     assert adv.image is not None
     assert adv.distance.value < np.inf
+
+
+def test_targeted_attack_pytorch(bn_targeted_adversarial_pytorch):
+    adv = bn_targeted_adversarial_pytorch
+    attack = Attack()
+    attack(adv, verbose=True, num_random_targets=2)
+    assert adv.image is not None
+    assert adv.distance.value < np.inf