CUQIpy 1.0.0.post0.dev352__tar.gz → 1.0.0.post0.dev360__tar.gz

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/CUQIpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 1.0.0.post0.dev352
+Version: 1.0.0.post0.dev360
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>, Chao Zhang <chaz@dtu.dk>
 License:                                  Apache License

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/CUQIpy.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ cuqi/experimental/mcmc/_mh.py
 cuqi/experimental/mcmc/_pcn.py
 cuqi/experimental/mcmc/_rto.py
 cuqi/experimental/mcmc/_sampler.py
+cuqi/experimental/mcmc/_utilities.py
 cuqi/geometry/__init__.py
 cuqi/geometry/_geometry.py
 cuqi/implicitprior/__init__.py

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CUQIpy
-Version: 1.0.0.post0.dev352
+Version: 1.0.0.post0.dev360
 Summary: Computational Uncertainty Quantification for Inverse problems in Python
 Maintainer-email: "Nicolai A. B. Riis" <nabr@dtu.dk>, "Jakob S. Jørgensen" <jakj@dtu.dk>, "Amal M. Alghamdi" <amaal@dtu.dk>, Chao Zhang <chaz@dtu.dk>
 License:                                  Apache License

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/cuqi/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-06-19T09:05:37+0200",
+ "date": "2024-07-01T14:33:09+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "1e1deddbe7925206fdaef6a2d9bf8ce9e33ad73d",
- "version": "1.0.0.post0.dev352"
+ "full-revisionid": "4da44104c9163182cd1eeb31fb4678a2893111fe",
+ "version": "1.0.0.post0.dev360"
 }
 '''  # END VERSION_JSON
 

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/cuqi/experimental/mcmc/__init__.py

@@ -12,3 +12,4 @@ from ._gibbs import HybridGibbsNew
 from ._conjugate import ConjugateNew
 from ._conjugate_approx import ConjugateApproxNew
 from ._direct import DirectNew
+from ._utilities import find_valid_samplers

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/cuqi/experimental/mcmc/_cwmh.py

@@ -100,6 +100,9 @@ class CWMHNew(ProposalBasedSamplerNew):
             raise ValueError(
                 "Target should be an instance of "+\
                 f"{cuqi.density.Density.__class__.__name__}")
+        # Fail when there is no log density, which is currently assumed to be the case in case NaN is returned.
+        if np.isnan(self.target.logd(self._default_initial_point)):
+            raise ValueError("Target does not have valid logd")
         
     def validate_proposal(self):
         if not isinstance(self.proposal, cuqi.distribution.Distribution):

{cuqipy-1.0.0.post0.dev352 → cuqipy-1.0.0.post0.dev360}/cuqi/experimental/mcmc/_mh.py

@@ -32,7 +32,9 @@ class MHNew(ProposalBasedSamplerNew):
         self._scale_temp = self.scale
 
     def validate_target(self):
-        pass # All targets are valid
+        # Fail only when there is no log density, which is currently assumed to be the case in case NaN is returned.
+        if np.isnan(self.target.logd(self._default_initial_point)):
+            raise ValueError("Target does not have valid logd")
 
     def validate_proposal(self):
         if not isinstance(self.proposal, cuqi.distribution.Distribution):

cuqipy-1.0.0.post0.dev360/cuqi/experimental/mcmc/_utilities.py

@@ -0,0 +1,17 @@
+import cuqi
+import inspect
+
+def find_valid_samplers(target):
+    """ Finds all samplers in the cuqi.experimental.mcmc module that accept the provided target. """
+
+    all_samplers = [(name, cls) for name, cls in inspect.getmembers(cuqi.experimental.mcmc, inspect.isclass) if issubclass(cls, cuqi.experimental.mcmc.SamplerNew)]
+    valid_samplers = []
+
+    for name, sampler in all_samplers:
+        try:
+            sampler(target)
+            valid_samplers += [name]
+        except:
+            pass
+
+    return valid_samplers