lisaanalysistools 1.1.7__cp310-cp310-macosx_13_0_x86_64.whl → 1.1.8__cp310-cp310-macosx_13_0_x86_64.whl

{lisaanalysistools-1.1.7.dist-info → lisaanalysistools-1.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: lisaanalysistools
-Version: 1.1.7
+Version: 1.1.8
 Summary: A package for LISA Data Analysis
 Author-Email: Michael Katz <mikekatz04@gmail.com>
 Classifier: Environment :: GPU :: NVIDIA CUDA
@@ -43,6 +43,7 @@ Requires-Dist: pypandoc; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: sphinx-rtd-theme; extra == "doc"
 Requires-Dist: sphinx-tippy; extra == "doc"
+Requires-Dist: corner; extra == "doc"
 Provides-Extra: sampling
 Requires-Dist: eryn; extra == "sampling"
 Requires-Dist: fastlisaresponse; extra == "sampling"
@@ -52,6 +53,7 @@ Provides-Extra: testing
 Requires-Dist: matplotlib; extra == "testing"
 Requires-Dist: eryn; extra == "testing"
 Requires-Dist: gbgpu; extra == "testing"
+Requires-Dist: corner; extra == "testing"
 Description-Content-Type: text/markdown
 
 # LISA Analysis Tools

{lisaanalysistools-1.1.7.dist-info → lisaanalysistools-1.1.8.dist-info}/RECORD

@@ -1,14 +1,18 @@
+lisaanalysistools-1.1.8.dist-info/RECORD,,
+lisaanalysistools-1.1.8.dist-info/WHEEL,sha256=yHKsA883OdmpXCdmipWbbWSdectbfcDLleq3W1gP8-c,115
+lisaanalysistools-1.1.8.dist-info/METADATA,sha256=Ek1HWra5BpRVijxniGcdd2Yh_Cah8_ugy2TMyw7EYhs,10673
+lisaanalysistools-1.1.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 lisaanalysistools/git_version.py,sha256=rupaoMweI0CHjo635dMJ0oD594fuFzkOqsUYK01B1xw,93
 lisatools/detector.py,sha256=LxxAesyQ_vKX7Vtb8VDsLbXBhFvjMoihTJnfJIqYnCI,21026
 lisatools/datacontainer.py,sha256=ChMXkaVCzxe9n90slN4Ncsh8Sd3lGx9PX5hyNCYXG0E,10069
-lisatools/_version.py,sha256=XScxAJn_hLwoilMyvvJG_0tPX3X-Jhde5mefhI8pVSM,704
+lisatools/_version.py,sha256=Cfx_H3P59Rdertk805_UHOIxCNkJ07smlwr82JJzX0E,704
 lisatools/stochastic.py,sha256=YHtM9Ll02wyqezCJO53L34x3mt_-qs9n9abdXcEap8o,10518
-lisatools/__init__.py,sha256=KyfqCGxdurCKZPVK3-3jwyje5enGcfE9rVVbplzWVgE,1433
+lisatools/__init__.py,sha256=Gbzsa4gaWOfOz7_OrO2xKsJFwy9U7SAmRUnvoGgdMg8,2404
 lisatools/git_version.py.in,sha256=yLNZEc1_MKc0uigMy8ZlNhOZvsqaIHeBd4ogM6LTGNI,141
 lisatools/sensitivity.py,sha256=gn8AMbel2BGg3ELptCSM9b2MmSf_gX39QVQ-TK5d8TY,29658
 lisatools/diagnostic.py,sha256=rm--mBNIEylT2qdJD-b60yfOrzNBTYT1Aki6Ee7KVQ4,34501
 lisatools/analysiscontainer.py,sha256=UQft6SvyDueDtuL1H1auiEzG5IEsFwRiiXf_0DHtu5U,16289
-lisatools/cutils/__init__.py,sha256=zZd1xjLJsOLcFmnugScKpV_SgvwCkVmfitzFhQ8v-b8,3978
+lisatools/cutils/__init__.py,sha256=XnZusb0zICP-P0ay4ILJe7SLvM5GzvgCCXd0OK--uOs,4403
 lisatools/sampling/utility.py,sha256=R5LKNK0A36L1PzLjCENQjDWcDjsR1oUBQGrR9PqasSA,15482
 lisatools/sampling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lisatools/sampling/prior.py,sha256=1K1PMStpwO9WT0qG0aotKSyoNjuehXNbzTDtlk8Q15M,21407
@@ -38,7 +42,3 @@ lisatools/sources/emri/waveform.py,sha256=M6NFZ2s00SVGL1CuyColcZw2UmE0qraGNh1dKC
 lisatools/sources/emri/__init__.py,sha256=3W0kL4bfTtZNm-wM5t6Y0TTjtZMh4fe_qDyZ6a5rLck,38
 lisatools_backend_cpu/pycppdetector.cpython-310-darwin.so,sha256=vuT-mWclHn3xP6xvti2dIbRQrmY07YalMnebB_9ioIs,199712
 lisatools_backend_cpu/git_version.py,sha256=rupaoMweI0CHjo635dMJ0oD594fuFzkOqsUYK01B1xw,93
-lisaanalysistools-1.1.7.dist-info/RECORD,,
-lisaanalysistools-1.1.7.dist-info/WHEEL,sha256=yHKsA883OdmpXCdmipWbbWSdectbfcDLleq3W1gP8-c,115
-lisaanalysistools-1.1.7.dist-info/METADATA,sha256=UG4G7ekzdytSOIZ4Rl52UwcpagkL41QmgezhmkbzDXc,10593
-lisaanalysistools-1.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357

lisatools/__init__.py

@@ -29,7 +29,6 @@ except (ModuleNotFoundError, ImportError):
     _is_editable = False
 
 from . import cutils, utils
-from .cutils import KNOWN_BACKENDS
 
 from gpubackendtools import get_backend, has_backend, get_first_backend
 from gpubackendtools import Globals
@@ -44,6 +43,37 @@ add_backends = {
 
 Globals().backends_manager.add_backends(add_backends)
 
+Globals().backends_manager.add_backends(add_backends)
+
+
+from gpubackendtools import get_backend as _get_backend
+from gpubackendtools import has_backend as _has_backend
+from gpubackendtools import get_first_backend as _get_first_backend
+from gpubackendtools.gpubackendtools import Backend
+
+
+def get_backend(backend: str) -> Backend:
+    __doc__ = _get_backend.__doc__
+    if "lisatools_" not in backend:
+        return _get_backend("lisatools_" + backend)
+    else:
+        return _get_backend(backend)
+
+
+def has_backend(backend: str) -> Backend:
+    __doc__ = _has_backend.__doc__
+    if "lisatools_" not in backend:
+        return _has_backend("lisatools_" + backend)
+    else:
+        return _has_backend(backend)
+
+        
+def get_first_backend(backend: str) -> Backend:
+    __doc__ = _get_first_backend.__doc__
+    if "lisatools_" not in backend:
+        return _get_first_backend("lisatools_" + backend)
+    else:
+        return _get_first_backend(backend)
 
 __all__ = [
     "__version__",
@@ -55,4 +85,6 @@ __all__ = [
     "get_backend",
     "get_file_manager",
     "has_backend",
+    "get_backend",
+    "get_first_backend",
 ]

lisatools/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.1.7'
-__version_tuple__ = version_tuple = (1, 1, 7)
+__version__ = version = '1.1.8'
+__version_tuple__ = version_tuple = (1, 1, 8)
 
 __commit_id__ = commit_id = None

lisatools/cutils/__init__.py

@@ -13,10 +13,12 @@ from gpubackendtools.exceptions import *
 @dataclasses.dataclass
 class LISAToolsBackendMethods(BackendMethods):
     pycppDetector: object
+    # psd_likelihood: typing.Callable[(...), None]
 
 class LISAToolsBackend:
     # TODO: not ClassVar?
     pycppDetector: object
+    # psd_likelihood: typing.Callable[(...), None]
 
     def __init__(self, lisatools_backend_methods):
 
@@ -24,6 +26,7 @@ class LISAToolsBackend:
         # pass rest to general backend
         assert isinstance(lisatools_backend_methods, LISAToolsBackendMethods)
         self.pycppDetector = lisatools_backend_methods.pycppDetector
+        # self.psd_likelihood = lisatools_backend_methods.psd_likelihood
     
 
 class LISAToolsCpuBackend(CpuBackend, LISAToolsBackend):
@@ -39,6 +42,7 @@ class LISAToolsCpuBackend(CpuBackend, LISAToolsBackend):
     def cpu_methods_loader() -> LISAToolsBackendMethods:
         try:
             import lisatools_backend_cpu.pycppdetector
+            # import lisatools_backend_cpu.psd
 
         except (ModuleNotFoundError, ImportError) as e:
             raise BackendUnavailableException(
@@ -49,6 +53,7 @@ class LISAToolsCpuBackend(CpuBackend, LISAToolsBackend):
 
         return LISAToolsBackendMethods(
             pycppDetector=lisatools_backend_cpu.pycppdetector.pycppDetector,
+            # psd_likelihood=lisatools_backend_cpu.psd.psd_likelihood,
             xp=numpy,
         )
 
@@ -66,7 +71,8 @@ class LISAToolsCuda11xBackend(Cuda11xBackend, LISAToolsBackend):
     @staticmethod
     def cuda11x_module_loader():
         try:
-            import lisatools_backend_cuda11x.utils
+            import lisatools_backend_cuda11x.pycppdetector
+            import lisatools_backend_cuda11x.psd
 
         except (ModuleNotFoundError, ImportError) as e:
             raise BackendUnavailableException(
@@ -82,6 +88,7 @@ class LISAToolsCuda11xBackend(Cuda11xBackend, LISAToolsBackend):
 
         return LISAToolsBackendMethods(
             pycppDetector=lisatools_backend_cuda11x.pycppdetector.pycppDetector,
+            # psd_likelihood=lisatools_backend_cuda11x.psd.psd_likelihood,
             xp=cupy,
         )
 
@@ -97,7 +104,8 @@ class LISAToolsCuda12xBackend(Cuda12xBackend, LISAToolsBackend):
     @staticmethod
     def cuda12x_module_loader():
         try:
-            import lisatools_backend_cuda12x.utils
+            import lisatools_backend_cuda12x.pycppdetector
+            # import lisatools_backend_cuda12x.psd
 
         except (ModuleNotFoundError, ImportError) as e:
             raise BackendUnavailableException(
@@ -113,14 +121,9 @@ class LISAToolsCuda12xBackend(Cuda12xBackend, LISAToolsBackend):
 
         return LISAToolsBackendMethods(
             pycppDetector=lisatools_backend_cuda12x.pycppdetector.pycppDetector,
+            # psd_likelihood=lisatools_backend_cuda12x.psd.psd_likelihood,
             xp=cupy,
         )
 
 
-KNOWN_BACKENDS = {
-    "cuda12x": LISAToolsCuda12xBackend,
-    "cuda11x": LISAToolsCuda11xBackend,
-    "cpu": LISAToolsCpuBackend,
-}
-
 """List of existing backends, per default order of preference."""