Improve clone_module support for non Module objects and update travis tests. (#142)

* Fix clone of None.

* Update changelog.

* Fix VGG flower download and untaring.

* Update changelog.

* Add torch 1.5 and torchvision 0.6 to travis.

Author: seba-1511

.travis.yml

@@ -16,6 +16,7 @@ env:
     - 'TV=0.4.0 TORCH=1.2.0'
     - 'TV=0.4.1 TORCH=1.3.0'
     - 'TV=0.5.0 TORCH=1.4.0'
+    - 'TV=0.6.0 TORCH=1.5.0'
 
 before_install: |
   if [ "$TRAVIS_OS_NAME" == "osx" ]; then

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* clone_module supports non-Module objects.
+* VGG flowers now relies on tarfile.open() instead of tarfile.TarFile().
+
 
 ## v0.1.1
 

learn2learn/utils.py

@@ -95,6 +95,8 @@ def clone_module(module):
     # First, create a copy of the module.
     # Adapted from:
     # https://github.com/pytorch/pytorch/blob/65bad41cbec096aa767b3752843eddebf845726f/torch/nn/modules/module.py#L1171
+    if not isinstance(module, torch.nn.Module):
+        return module
     clone = module.__new__(type(module))
     clone.__dict__ = module.__dict__.copy()
     clone._parameters = clone._parameters.copy()
@@ -152,6 +154,8 @@ def detach_module(module):
     error.backward()  # Gradients are back-propagate on clone, not net.
     ~~~
     """
+    if not isinstance(module, torch.nn.Module):
+        return
     # First, re-write all parameters
     for param_key in module._parameters:
         if module._parameters[param_key] is not None:

learn2learn/vision/datasets/vgg_flowers.py

@@ -91,8 +91,9 @@ def download(self):
         req = requests.get(IMAGES_URL)
         with open(tar_path, 'wb') as archive:
             archive.write(req.content)
-        tar_file = tarfile.TarFile(tar_path)
+        tar_file = tarfile.open(tar_path)
         tar_file.extractall(data_path)
+        tar_file.close()
         os.remove(tar_path)
 
         label_path = os.path.join(data_path, os.path.basename(LABELS_URL))
@@ -134,5 +135,5 @@ def __len__(self):
     assert len(SPLITS['validation']) == 15
     assert len(SPLITS['test']) == 16
     assert len(SPLITS['all']) == 102
-    flowers = VGGFlower102('~/data', download=True)
+    flowers = VGGFlower102('~/vgg_data', download=True)
     print(len(flowers))

tests/unit/utils_test.py

@@ -90,6 +90,26 @@ def test_clone_module_basics(self):
         for a, b in zip(self.model.parameters(), cloned_model.parameters()):
             self.assertTrue(torch.equal(a, b))
 
+    def test_clone_module_nomodule(self):
+        # Tests that we can clone non-module objects
+        class TrickyModule(torch.nn.Module):
+
+            def __init__(self):
+                super(TrickyModule, self).__init__()
+                self.tricky_modules = torch.nn.ModuleList([
+                    torch.nn.Linear(2, 1),
+                    None,
+                    torch.nn.Linear(1, 1),
+                ])
+
+        model = TrickyModule()
+        clone = l2l.clone_module(model)
+        for i, submodule in enumerate(clone.tricky_modules):
+            if i % 2 == 0:
+                self.assertTrue(submodule is not None)
+            else:
+                self.assertTrue(submodule is None)
+
     def test_clone_module_models(self):
         ref_models = [l2l.vision.models.OmniglotCNN(10),
                   l2l.vision.models.MiniImagenetCNN(10)]