Fix all remaining Python 2 incompatibilities. Ahem.

Author: Ludwig Schubert

lucid/modelzoo/aligned_activations.py

@@ -19,7 +19,7 @@
 from lucid.misc.io import load
 
 import numpy as np
-from functools import lru_cache
+from cachetools.func import lru_cache
 
 PATH_TEMPLATE = "gs://modelzoo/aligned-activations/{}/{}-{:05d}-of-01000.npy"
 PAGE_SIZE = 10000

setup.py

@@ -18,7 +18,7 @@
 
 from setuptools import setup, find_packages
 
-version = "0.3.5"
+version = "0.3.6"
 
 test_deps = ["future", "twine", "pytest", "pytest-mock", "python-coveralls"]
 
@@ -64,6 +64,7 @@
         "pyopengl",
         "click",
         "filelock",
+        "cachetools"
     ],
     tests_require=test_deps,
     extras_require=extras,

tests/fixtures/arrays.npz

@@ -59,7 +59,7 @@ def test_model_properties(name, model_class):
     assert hasattr(model_class, "layers")
     assert len(model_class.layers) > 0
     last_layer = model_class.layers[-1]
-    assert last_layer['type'] == 'dense'
+    assert 'dense' in last_layer.tags
     assert type(last_layer) == Layer
     assert last_layer.model_class == model_class
     assert hasattr(model_class, "name")

tests/modelzoo/test_vision_models.py

@@ -31,6 +31,6 @@ def test_aligned_activation_atlas():
     atlasses = aligned_activation_atlas(
         model1, layer1, model2, layer2, number_activations=subset
     )
-    path = f"tests/recipes/results/activation_atlas/aligned_atlas-{index}-of-{len(atlasses)}.jpg"
+    path = "tests/recipes/results/activation_atlas/aligned_atlas-{}-of-{}.jpg".format(index, len(atlasses))
     for index, atlas in enumerate(atlasses):
         save(atlas, path)