fix test

Author: ferrine

pymc3/memoize.py

@@ -55,6 +55,9 @@ def __getstate__(self):
         state.pop('_cache', None)
         return state
 
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+
 
 def hashable(a):
     """

pymc3/model.py

@@ -569,7 +569,7 @@ def __init__(self, mean=0, sd=1, name='', model=None):
     """
     def __new__(cls, *args, **kwargs):
         # resolves the parent instance
-        instance = object.__new__(cls)
+        instance = super(Model, cls).__new__(cls)
         if kwargs.get('model') is not None:
             instance._parent = kwargs.get('model')
         elif cls.get_contexts():

pymc3/tests/test_variational_inference.py

@@ -612,16 +612,24 @@ def test_remove_scan_op():
 
 
 def test_clear_cache():
+    import pickle
     pymc3.memoize.clear_cache()
+    assert all(len(c) == 0 for c in pymc3.memoize.CACHE_REGISTRY)
     with pm.Model():
         pm.Normal('n', 0, 1)
         inference = ADVI()
         inference.fit(n=10)
-        assert len(pm.variational.opvi.Approximation.logp.fget.cache) == 1
-        del inference
-        assert len(pm.variational.opvi.Approximation.logp.fget.cache) == 0
-        for c in pymc3.memoize.CACHE_REGISTRY:
-            assert len(c) == 0
+        assert any(len(c) != 0 for c in inference.approx._cache.values())
+        pymc3.memoize.clear_cache(inference.approx)
+        # should not be cleared at this call
+        assert all(len(c) == 0 for c in inference.approx._cache.values())
+        new_a = pickle.loads(pickle.dumps(inference.approx))
+        assert not hasattr(new_a, '_cache')
+        inference_new = pm.KLqp(new_a)
+        inference_new.fit(n=10)
+        assert any(len(c) != 0 for c in inference_new.approx._cache.values())
+        pymc3.memoize.clear_cache(inference_new.approx)
+        assert all(len(c) == 0 for c in inference_new.approx._cache.values())
 
 
 @pytest.fixture('module')

pymc3/variational/opvi.py

@@ -755,13 +755,13 @@ def __new__(cls, group=None, vfam=None, params=None, *args, **kwargs):
             if vfam is not None and params is not None:
                 raise TypeError('Cannot call Group with both `vfam` and `params` provided')
             elif vfam is not None:
-                return object.__new__(cls.group_for_short_name(vfam))
+                return super(Group, cls).__new__(cls.group_for_short_name(vfam))
             elif params is not None:
-                return object.__new__(cls.group_for_params(params))
+                return super(Group, cls).__new__(cls.group_for_params(params))
             else:
                 raise TypeError('Need to call Group with either `vfam` or `params` provided')
         else:
-            return object.__new__(cls)
+            return super(Group, cls).__new__(cls)
 
     def __init__(self, group,
                  vfam=None,