Merge pull request #59 from MadryLab/custom_class_and_version

fix type checking for dataset init and increment version

robustness/__init__.py

@@ -1,2 +1,2 @@
 name = "robustness"
-__version__ = "1.0.post1"
+__version__ = "1.2.post1"

robustness/attack_steps.py

@@ -122,7 +122,6 @@ def project(self, x):
     def step(self, x, g):
         """
         """
-        # Scale g so that each element of the batch is at least norm 1
         l = len(x.shape) - 1
         g_norm = ch.norm(g.view(g.shape[0], -1), dim=1).view(-1, *([1]*l))
         scaled_g = g / (g_norm + 1e-10)

robustness/datasets.py

@@ -88,7 +88,8 @@ def override_args(self, default_args, new_args):
         if len(extra_args) > 0: raise ValueError(f"Invalid arguments: {extra_args}")
         for k in kwargs:
             req_type = type(default_args[k])
-            if not isinstance(kwargs[k], req_type):
+            no_nones = (default_args[k] is not None) and (kwargs[k] is not None)
+            if no_nones and (not isinstance(kwargs[k], req_type)):
                 raise ValueError(f"Argument {k} should have type {req_type}")
         return {**default_args, **kwargs}
 

setup.py

@@ -22,7 +22,7 @@
   # Versions should comply with PEP440.  For a discussion on single-sourcing
   # the version across setup.py and the project code, see
   # https://packaging.python.org/en/latest/single_source_version.html
-  version='1.2',
+  version='1.2.post1',
 
   description='Tools for Robustness',
   long_description=long_description,