InfluenceDiffusion 0.0.16__tar.gz → 0.0.17__tar.gz

{influencediffusion-0.0.16 → influencediffusion-0.0.17}/InfluenceDiffusion/Inference.py

@@ -4,9 +4,9 @@ import numpy as np
 from typing import Dict, Callable
 from functools import partial
 from scipy.stats import norm
+from scipy.stats._distn_infrastructure import rv_frozen
 
 from .estimation_models.OptimEstimation import GLTWeightEstimator
-from .utils import make_jax_cdf
 
 __all__ = ["GLTInferenceModule"]
 
@@ -15,7 +15,7 @@ class GLTInferenceModule:
     def __init__(self, estimator: GLTWeightEstimator, vertex_2_jax_cdf: Dict[int, Callable] = None):
         self.estimator = estimator
         if vertex_2_jax_cdf is None:
-            self.vertex_2_jax_cdf = {vertex: make_jax_cdf(distrib)
+            self.vertex_2_jax_cdf = {vertex: self._make_jax_cdf(distrib)
                                      for vertex, distrib in self.estimator.vertex_2_distrib.items()}
         else:
             self.vertex_2_jax_cdf = vertex_2_jax_cdf
@@ -41,6 +41,18 @@ class GLTInferenceModule:
         masks_tm1 = jnp.vstack([tm1_active_masks, tm1_failed_masks], dtype=jnp.float32)
         return ys, masks_t, masks_tm1
 
+    @staticmethod
+    def _make_jax_cdf(distrib: rv_frozen):
+        name = distrib.dist.name
+        args = distrib.args
+        kwargs = distrib.kwds
+        local_dic = {}
+        exec(f"jax_distrib=jax.scipy.stats.{name}", None, local_dic)
+        jax_distrib = local_dic["jax_distrib"]
+        if name == "expon":
+            return lambda x: 1. - jnp.exp(-x)
+        return lambda x: jax_distrib.cdf(x, *args, **kwargs)
+
     @staticmethod
     def _vertex_ll(parent_weights, cdf, ys, masks_t, masks_tm1, eps=1e-6):
         F_t = cdf(masks_t @ parent_weights)

{influencediffusion-0.0.16 → influencediffusion-0.0.17}/InfluenceDiffusion/utils.py

@@ -1,7 +1,5 @@
 import numpy as np
 from typing import Iterable, Set
-from scipy.stats._distn_infrastructure import rv_frozen
-import jax.numpy as jnp
 
 
 def multiple_union(set_list: Iterable[Set]):
@@ -29,15 +27,3 @@ def random_vector_inside_simplex(dim: int, ub: float = 1.):
 def random_vector_on_simplex(dim: int, ub: float = 1.):
     X = random_vector_inside_simplex(dim=dim, ub=1)
     return X / np.sum(X) * ub
-
-
-def make_jax_cdf(distrib: rv_frozen):
-    name = distrib.dist.name
-    args = distrib.args
-    kwargs = distrib.kwds
-    local_dic = {}
-    exec(f"jax_distrib=jax.scipy.stats.{name}", None, local_dic)
-    jax_distrib = local_dic["jax_distrib"]
-    if name == "expon":
-        return lambda x: 1. - jnp.exp(-x)
-    return lambda x: jax_distrib.cdf(x, *args, **kwargs)

{influencediffusion-0.0.16 → influencediffusion-0.0.17}/InfluenceDiffusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InfluenceDiffusion
-Version: 0.0.16
+Version: 0.0.17
 Summary: InfluenceDiffusion package
 Author: Alexander Kagan
 Author-email: <amkagan@umich.edu>

{influencediffusion-0.0.16 → influencediffusion-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InfluenceDiffusion
-Version: 0.0.16
+Version: 0.0.17
 Summary: InfluenceDiffusion package
 Author: Alexander Kagan
 Author-email: <amkagan@umich.edu>

{influencediffusion-0.0.16 → influencediffusion-0.0.17}/setup.py

@@ -3,7 +3,7 @@ from pathlib import Path
 this_directory = Path(__file__).parent
 LONG_DESCRIPTION = (this_directory / "README.md").read_text()
 
-VERSION = '0.0.16'
+VERSION = '0.0.17'
 DESCRIPTION = 'InfluenceDiffusion package'
 
 setup(