remove special case serialization for DensityDist.logp

Author: Spaak

pymc3/distributions/distribution.py

@@ -23,7 +23,6 @@
 
 import aesara
 import aesara.tensor as at
-import dill
 
 from aesara.tensor.random.op import RandomVariable
 from aesara.tensor.random.var import RandomStateSharedVariable
@@ -533,26 +532,5 @@ def __init__(
         self.wrap_random_with_dist_shape = wrap_random_with_dist_shape
         self.check_shape_in_random = check_shape_in_random
 
-    def __getstate__(self):
-        # We use dill to serialize the logp function, as this is almost
-        # always defined in the notebook and won't be pickled correctly.
-        # Fix https://github.com/pymc-devs/pymc3/issues/3844
-        try:
-            logp = dill.dumps(self.logp)
-        except RecursionError as err:
-            if type(self.logp) == types.MethodType:
-                raise ValueError(
-                    "logp for DensityDist is a bound method, leading to RecursionError while serializing"
-                ) from err
-            else:
-                raise err
-        vals = self.__dict__.copy()
-        vals["logp"] = logp
-        return vals
-
-    def __setstate__(self, vals):
-        vals["logp"] = dill.loads(vals["logp"])
-        self.__dict__ = vals
-
     def _distr_parameters_for_repr(self):
         return []

pymc3/util.py

@@ -19,7 +19,7 @@
 from typing import Dict, List, Tuple, Union
 
 import arviz
-import dill
+import cloudpickle
 import numpy as np
 import xarray
 
@@ -347,7 +347,7 @@ def hashable(a=None) -> int:
         pass
     # Not hashable >>>
     try:
-        return hash(dill.dumps(a))
+        return hash(cloudpickle.dumps(a))
     except Exception:
         if hasattr(a, "__dict__"):
             return hashable(a.__dict__)