aspire-inference 0.1.0a2__py3-none-any.whl → 0.1.0a4__py3-none-any.whl

aspire/flows/base.py

@@ -1,18 +1,28 @@
+import logging
 from typing import Any
 
 from ..history import FlowHistory
-from ..transforms import BaseTransform
+from ..transforms import BaseTransform, IdentityTransform
+
+logger = logging.getLogger(__name__)
 
 
 class Flow:
+    xp = None  # type: Any
+
     def __init__(
         self,
         dims: int,
         device: Any,
-        data_transform: BaseTransform = None,
+        data_transform: BaseTransform | None = None,
     ):
         self.dims = dims
         self.device = device
+
+        if data_transform is None:
+            data_transform = IdentityTransform(self.xp)
+            logger.info("No data_transform provided, using IdentityTransform.")
+
         self.data_transform = data_transform
 
     def log_prob(self, x):

aspire/transforms.py

@@ -4,7 +4,6 @@ from typing import Any
 
 from array_api_compat import device as get_device
 from array_api_compat import is_torch_namespace
-from scipy.special import erf, erfinv
 
 from .flows import get_flow_wrapper
 from .utils import (
@@ -50,13 +49,17 @@ class IdentityTransform(BaseTransform):
     """Identity transform that does nothing to the data."""
 
     def fit(self, x):
-        return x
+        return copy_array(x, xp=self.xp)
 
     def forward(self, x):
-        return x, self.xp.zeros(len(x), device=get_device(x))
+        return copy_array(x, xp=self.xp), self.xp.zeros(
+            len(x), device=get_device(x)
+        )
 
     def inverse(self, y):
-        return y, self.xp.zeros(len(y), device=get_device(y))
+        return copy_array(y, xp=self.xp), self.xp.zeros(
+            len(y), device=get_device(y)
+        )
 
 
 class CompositeTransform(BaseTransform):
@@ -329,6 +332,8 @@ class ProbitTransform(BaseTransform):
         return self.forward(x)[0]
 
     def forward(self, x):
+        from scipy.special import erfinv
+
         y = (x - self.lower) / (self.upper - self.lower)
         y = self.xp.clip(y, self.eps, 1.0 - self.eps)
         y = erfinv(2 * y - 1) * math.sqrt(2)
@@ -339,6 +344,8 @@ class ProbitTransform(BaseTransform):
         return y, log_abs_det_jacobian
 
     def inverse(self, y):
+        from scipy.special import erf
+
         log_abs_det_jacobian = (
             -(0.5 * (math.log(2 * math.pi) + y**2)).sum(-1)
             - self._scale_log_abs_det_jacobian

{aspire_inference-0.1.0a2.dist-info → aspire_inference-0.1.0a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aspire-inference
-Version: 0.1.0a2
+Version: 0.1.0a4
 Summary: Accelerate Sequential Posterior Inference via REuse
 Author-email: "Michael J. Williams" <michaeljw1@googlemail.com>
 License: MIT
@@ -14,6 +14,8 @@ Requires-Dist: numpy
 Requires-Dist: array-api-compat
 Requires-Dist: wrapt
 Requires-Dist: h5py
+Provides-Extra: scipy
+Requires-Dist: scipy; extra == "scipy"
 Provides-Extra: jax
 Requires-Dist: jax; extra == "jax"
 Requires-Dist: jaxlib; extra == "jax"
@@ -21,6 +23,7 @@ Requires-Dist: flowjax; extra == "jax"
 Provides-Extra: torch
 Requires-Dist: torch; extra == "torch"
 Requires-Dist: zuko; extra == "torch"
+Requires-Dist: tqdm; extra == "torch"
 Provides-Extra: minipcn
 Requires-Dist: minipcn; extra == "minipcn"
 Provides-Extra: emcee

{aspire_inference-0.1.0a2.dist-info → aspire_inference-0.1.0a4.dist-info}/RECORD

@@ -3,10 +3,10 @@ aspire/aspire.py,sha256=AEkFUuOCF4F_iXUqRNst_4mucxozYRK4fG4V2wGrT4Q,15762
 aspire/history.py,sha256=l_j-riZKbTWK7Wz9zvvD_mTk9psNCKItiveYhr_pYv8,4313
 aspire/plot.py,sha256=oXwUDOb_953_ADm2KLk41JIfpE3JeiiQiSYKvUVwLqw,1423
 aspire/samples.py,sha256=hMlONOtSuYE3bU6r_wQCZ8Z1dcc3Ch15bNMLO8fGU8g,16263
-aspire/transforms.py,sha256=R_BNPlYxK8tvACkZMjgHayr9gUpHxUQiD8148jfTnmg,16407
+aspire/transforms.py,sha256=fg2_UELJWjJ6gnqQi6X7s1CgKBhQ5hP7Ipil3tTjCeg,16566
 aspire/utils.py,sha256=fQeLMauCN3vAogKbVTVg9jfjW7nTEFi7V6Ot-BYNfxE,14301
 aspire/flows/__init__.py,sha256=3gGXF4HziMlZSmcEdJ_uHtrP-QEC6RXvylm4vtM-Xnk,1306
-aspire/flows/base.py,sha256=scBhYvtaoa1x_gcrWs0nLfOKhWYu2bqivVVqbH4zSI8,860
+aspire/flows/base.py,sha256=oTw2ZkxCsA5RZhnMuIu9M-2FPHvQG2TGFIEJZVK4a2g,1140
 aspire/flows/jax/__init__.py,sha256=7cmiY_MbEC8RDA8Cmi8HVnNJm0sqFKlBsDethdsy5lA,52
 aspire/flows/jax/flows.py,sha256=jZ93fnc7U7ZhZLVixGUTwyeDb6Vz0UWpYkkVHwirNug,2896
 aspire/flows/jax/utils.py,sha256=UlvXOOqC5fNsmVUnU4LSksliq7pLRm9NhOu0ZvVHqgc,1455
@@ -21,8 +21,8 @@ aspire/samplers/smc/base.py,sha256=GePA6tm8Dno_AjCeNuRX3KOaKnoKSFHSRAb-QWx9wJE,1
 aspire/samplers/smc/blackjax.py,sha256=9w1ORzWTT1viwp99_ttLxnNMdgTO-VqAzsf-NhgG9vY,11722
 aspire/samplers/smc/emcee.py,sha256=ZXXyN2l1Bz5ZsCPEcswg-Kakiw41nNa2jEW1N8zGjuc,2498
 aspire/samplers/smc/minipcn.py,sha256=ZjeP4iHFR67G8WKEfMe0b1McrtPgQMNHyyy4vRx6WNE,2747
-aspire_inference-0.1.0a2.dist-info/licenses/LICENSE,sha256=DN-eRtBfS9dZyT0Ds0Mdn2Y4nb-ZQ7h71vpASYBm5k4,1076
-aspire_inference-0.1.0a2.dist-info/METADATA,sha256=8s65XoHR6AJmpCDFAA1mqqCWZXd_m8skZgOotgNRO2U,1475
-aspire_inference-0.1.0a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aspire_inference-0.1.0a2.dist-info/top_level.txt,sha256=9FRIYEl2xwVFG7jSOBHsElHQ0y3_4fq01Cf4_OyMQn8,7
-aspire_inference-0.1.0a2.dist-info/RECORD,,
+aspire_inference-0.1.0a4.dist-info/licenses/LICENSE,sha256=DN-eRtBfS9dZyT0Ds0Mdn2Y4nb-ZQ7h71vpASYBm5k4,1076
+aspire_inference-0.1.0a4.dist-info/METADATA,sha256=9RBI_xCkn1b0u7iOSjWZb7kCLoeZwYEwQrry--ieuQ8,1574
+aspire_inference-0.1.0a4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aspire_inference-0.1.0a4.dist-info/top_level.txt,sha256=9FRIYEl2xwVFG7jSOBHsElHQ0y3_4fq01Cf4_OyMQn8,7
+aspire_inference-0.1.0a4.dist-info/RECORD,,