fixed up for colab

mikekatz04 · Jan 6, 2025 · 7cfeb64 · 7cfeb64
1 parent e158257
commit 7cfeb64
Show file tree

Hide file tree

Showing 90 changed files with 651 additions and 289 deletions.
diff --git a/README.md b/README.md
@@ -160,7 +160,7 @@ Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduc
 
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/mikekatz04/BBHx/tags).
 
-Current Version: 1.1.2
+Current Version: 1.1.11
 
 ## Authors
 

diff --git a/bbhx/cutils/__init__.py b/bbhx/cutils/__init__.py
diff --git a/include/Interpolate.hh → bbhx/cutils/include/Interpolate.hh b/include/Interpolate.hh → bbhx/cutils/include/Interpolate.hh
diff --git a/include/Likelihood.hh → bbhx/cutils/include/Likelihood.hh b/include/Likelihood.hh → bbhx/cutils/include/Likelihood.hh
diff --git a/include/PhenomHM.hh → bbhx/cutils/include/PhenomHM.hh b/include/PhenomHM.hh → bbhx/cutils/include/PhenomHM.hh
diff --git a/include/Response.hh → bbhx/cutils/include/Response.hh b/include/Response.hh → bbhx/cutils/include/Response.hh
diff --git a/include/WaveformBuild.hh → bbhx/cutils/include/WaveformBuild.hh b/include/WaveformBuild.hh → bbhx/cutils/include/WaveformBuild.hh
diff --git a/bbhx/cutils/include/__init__.py b/bbhx/cutils/include/__init__.py
diff --git a/include/constants.h → bbhx/cutils/include/constants.h b/include/constants.h → bbhx/cutils/include/constants.h
diff --git a/include/cuda_complex.hpp → bbhx/cutils/include/cuda_complex.hpp b/include/cuda_complex.hpp → bbhx/cutils/include/cuda_complex.hpp
diff --git a/include/full.h → bbhx/cutils/include/full.h b/include/full.h → bbhx/cutils/include/full.h
diff --git a/include/global.h → bbhx/cutils/include/global.h b/include/global.h → bbhx/cutils/include/global.h
diff --git a/src/Interpolate.cu → bbhx/cutils/src/Interpolate.cu b/src/Interpolate.cu → bbhx/cutils/src/Interpolate.cu
diff --git a/src/Likelihood.cu → bbhx/cutils/src/Likelihood.cu b/src/Likelihood.cu → bbhx/cutils/src/Likelihood.cu
diff --git a/src/PhenomHM.cu → bbhx/cutils/src/PhenomHM.cu b/src/PhenomHM.cu → bbhx/cutils/src/PhenomHM.cu
diff --git a/src/Response.cu → bbhx/cutils/src/Response.cu b/src/Response.cu → bbhx/cutils/src/Response.cu
diff --git a/src/WaveformBuild.cu → bbhx/cutils/src/WaveformBuild.cu b/src/WaveformBuild.cu → bbhx/cutils/src/WaveformBuild.cu
diff --git a/bbhx/cutils/src/__init__.py b/bbhx/cutils/src/__init__.py
diff --git a/src/eob.pyx → bbhx/cutils/src/eob.pyx b/src/eob.pyx → bbhx/cutils/src/eob.pyx
diff --git a/src/interpolate.pyx → bbhx/cutils/src/interpolate.pyx b/src/interpolate.pyx → bbhx/cutils/src/interpolate.pyx
diff --git a/src/likelihood.pyx → bbhx/cutils/src/likelihood.pyx b/src/likelihood.pyx → bbhx/cutils/src/likelihood.pyx
diff --git a/src/phenomhm.pyx → bbhx/cutils/src/phenomhm.pyx b/src/phenomhm.pyx → bbhx/cutils/src/phenomhm.pyx
diff --git a/src/response.pyx → bbhx/cutils/src/response.pyx b/src/response.pyx → bbhx/cutils/src/response.pyx
diff --git a/src/waveformbuild.pyx → bbhx/cutils/src/waveformbuild.pyx b/src/waveformbuild.pyx → bbhx/cutils/src/waveformbuild.pyx
diff --git a/bbhx/likelihood.py b/bbhx/likelihood.py
@@ -19,19 +19,19 @@
 
 try:
     import cupy as cp
-    from bbhx.pyLikelihood import hdyn_wrap as hdyn_wrap_gpu
-    from bbhx.pyLikelihood import direct_like_wrap as direct_like_wrap_gpu
-    from bbhx.pyLikelihood import prep_hdyn as prep_hdyn_gpu
+    from .cutils.pyLikelihood import hdyn_wrap as hdyn_wrap_gpu
+    from .cutils.pyLikelihood import direct_like_wrap as direct_like_wrap_gpu
+    from .cutils.pyLikelihood import prep_hdyn as prep_hdyn_gpu
 
 except (ImportError, ModuleNotFoundError) as e:
     print("No CuPy")
     import numpy as cp
 
-from bbhx.pyLikelihood_cpu import prep_hdyn as prep_hdyn_cpu
-from bbhx.pyLikelihood_cpu import hdyn_wrap as hdyn_wrap_cpu
-from bbhx.pyLikelihood_cpu import direct_like_wrap as direct_like_wrap_cpu
+from .cutils.pyLikelihood_cpu import prep_hdyn as prep_hdyn_cpu
+from .cutils.pyLikelihood_cpu import hdyn_wrap as hdyn_wrap_cpu
+from .cutils.pyLikelihood_cpu import direct_like_wrap as direct_like_wrap_cpu
 
-from bbhx.utils.constants import *
+from .utils.constants import *
 
 from lisatools.sensitivity import SensitivityMatrix, AET1SensitivityMatrix
 

diff --git a/bbhx/response/fastfdresponse.py b/bbhx/response/fastfdresponse.py
@@ -20,13 +20,13 @@
 
 try:
     import cupy as cp
-    from bbhx.pyFDResponse import LISA_response_wrap as LISA_response_wrap_gpu
+    from .cutils.pyFDResponse import LISA_response_wrap as LISA_response_wrap_gpu
 
 except (ImportError, ModuleNotFoundError) as e:
     print("No CuPy or GPU response available.")
 
-from bbhx.pyFDResponse_cpu import LISA_response_wrap as LISA_response_wrap_cpu
-from bbhx.utils.constants import *
+from ..cutils.pyFDResponse_cpu import LISA_response_wrap as LISA_response_wrap_cpu
+from ..utils.constants import *
 
 from lisatools.detector import EqualArmlengthOrbits, Orbits
 

diff --git a/bbhx/utils/constants.py b/bbhx/utils/constants.py
@@ -0,0 +1,48 @@
+
+# Collection of citations for modules in bbhx package
+
+# Copyright (C) 2020 Michael L. Katz
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+MSUN_SI = 1.98848e+30
+YRSID_SI = 31558149.763545603
+AU_SI = 149597870700.0
+C_SI = 299792458.
+G_SI = 6.674080e-11
+GMSUN = 1.3271244210789466e+20
+MTSUN_SI = 4.925491025873693e-06
+MRSUN_SI = 1476.6250615036158
+PC_SI = 3.0856775814913674e+16
+PI = 3.141592653589793238462643383279502884
+PI_2 = 1.570796326794896619231321691639751442
+PI_3 = 1.047197551196597746154214461093167628
+PI_4 = 0.785398163397448309615660845819875721
+SQRTPI = 1.772453850905516027298167483341145183
+SQRTTWOPI = 2.506628274631000502415765284811045253
+INVSQRTPI = 0.564189583547756286948079451560772585
+INVSQRTTWOPI = 0.398942280401432677939946059934381868
+GAMMA = 0.577215664901532860606512090082402431
+SQRT2 = 1.414213562373095048801688724209698079
+SQRT3 = 1.732050807568877293527446341505872367
+SQRT6 = 2.449489742783178098197284074705891392
+INVSQRT2 = 0.707106781186547524400844362104849039
+INVSQRT3 = 0.577350269189625764509148780501957455
+INVSQRT6 = 0.408248290463863016366214012450981898
+F0 = 3.168753578687779e-08
+Omega0 = 1.9909865927683788e-07
+L_SI = 2.5e9
+eorbit = 0.004824185218078991
+ConstOmega = 1.99098659277e-7
diff --git a/bbhx/utils/interpolate.py b/bbhx/utils/interpolate.py
@@ -20,15 +20,15 @@
 
 try:
     import cupy as cp
-    from bbhx.pyInterpolate import interpolate_wrap as interpolate_wrap_gpu
+    from ..cutils.pyInterpolate import interpolate_wrap as interpolate_wrap_gpu
 
 
 except (ImportError, ModuleNotFoundError) as e:
     print("No CuPy or GPU interpolation available.")
 
-from bbhx.pyInterpolate_cpu import interpolate_wrap as interpolate_wrap_cpu
+from ..cutils.pyInterpolate_cpu import interpolate_wrap as interpolate_wrap_cpu
 
-from bbhx.utils.constants import *
+from ..utils.constants import *
 
 
 def searchsorted2d_vec(a, b, xp=None, **kwargs):

diff --git a/bbhx/waveformbuild.py b/bbhx/waveformbuild.py
@@ -21,14 +21,14 @@
 # import gpu stuff
 try:
     import cupy as cp
-    from bbhx.pyWaveformBuild import direct_sum_wrap as direct_sum_wrap_gpu
-    from bbhx.pyWaveformBuild import InterpTDI_wrap as InterpTDI_wrap_gpu
+    from .cutils.pyWaveformBuild import direct_sum_wrap as direct_sum_wrap_gpu
+    from .cutils.pyWaveformBuild import InterpTDI_wrap as InterpTDI_wrap_gpu
 
 except (ImportError, ModuleNotFoundError) as e:
     print("No CuPy")
 
-from bbhx.pyWaveformBuild_cpu import direct_sum_wrap as direct_sum_wrap_cpu
-from bbhx.pyWaveformBuild_cpu import InterpTDI_wrap as InterpTDI_wrap_cpu
+from .cutils.pyWaveformBuild_cpu import direct_sum_wrap as direct_sum_wrap_cpu
+from .cutils.pyWaveformBuild_cpu import InterpTDI_wrap as InterpTDI_wrap_cpu
 
 from .waveforms.phenomhm import PhenomHMAmpPhase
 from .response.fastfdresponse import LISATDIResponse

diff --git a/bbhx/waveforms/phenomhm.py b/bbhx/waveforms/phenomhm.py
@@ -25,23 +25,27 @@
 
 # import GPU stuff
 try:
-    from bbhx.pyPhenomHM import waveform_amp_phase_wrap as waveform_amp_phase_wrap_gpu
-    from bbhx.pyPhenomHM import (
+    from ..cutils.pyPhenomHM import (
+        waveform_amp_phase_wrap as waveform_amp_phase_wrap_gpu,
+    )
+    from ..cutils.pyPhenomHM import (
         get_phenomhm_ringdown_frequencies as get_phenomhm_ringdown_frequencies_gpu,
     )
-    from bbhx.pyPhenomHM import (
+    from ..cutils.pyPhenomHM import (
         get_phenomd_ringdown_frequencies as get_phenomd_ringdown_frequencies_gpu,
     )
     import cupy as cp
 
 except (ImportError, ModuleNotFoundError) as e:
     print("No CuPy or GPU PhenomHM module.")
 
-from bbhx.pyPhenomHM_cpu import waveform_amp_phase_wrap as waveform_amp_phase_wrap_cpu
-from bbhx.pyPhenomHM_cpu import (
+from ..cutils.pyPhenomHM_cpu import (
+    waveform_amp_phase_wrap as waveform_amp_phase_wrap_cpu,
+)
+from ..cutils.pyPhenomHM_cpu import (
     get_phenomhm_ringdown_frequencies as get_phenomhm_ringdown_frequencies_cpu,
 )
-from bbhx.pyPhenomHM_cpu import (
+from ..cutils.pyPhenomHM_cpu import (
     get_phenomd_ringdown_frequencies as get_phenomd_ringdown_frequencies_cpu,
 )
 
@@ -597,7 +601,9 @@ def __call__(self, *args, Tobs=None, direct=False, **kwargs):
                 Tobs = self.xp.full((self.num_bin_all, self.num_modes), Tobs)
             elif isinstance(Tobs, np.ndarray) and Tobs.ndim == 1:
                 assert Tobs.shape[0] == self.num_bin_all
-                Tobs = self.xp.repeat(self.xp.asarray(Tobs)[:, None], self.num_modes, axis=-1)
+                Tobs = self.xp.repeat(
+                    self.xp.asarray(Tobs)[:, None], self.num_modes, axis=-1
+                )
             elif isinstance(Tobs, np.ndarray) and Tobs.ndim == 2:
                 Tobs = self.xp.asarray(Tobs)
                 assert Tobs.shape == (self.num_bin_all, self.num_modes)

diff --git a/docs/doctrees/README.doctree b/docs/doctrees/README.doctree
diff --git a/docs/doctrees/bbhx_tutorial.doctree b/docs/doctrees/bbhx_tutorial.doctree
diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
diff --git a/docs/doctrees/index.doctree b/docs/doctrees/index.doctree
diff --git a/docs/doctrees/user/constants.doctree b/docs/doctrees/user/constants.doctree
diff --git a/docs/doctrees/user/like.doctree b/docs/doctrees/user/like.doctree
diff --git a/docs/doctrees/user/main.doctree b/docs/doctrees/user/main.doctree
diff --git a/docs/doctrees/user/response.doctree b/docs/doctrees/user/response.doctree
diff --git a/docs/doctrees/user/utils.doctree b/docs/doctrees/user/utils.doctree
diff --git a/docs/doctrees/user/waveforms.doctree b/docs/doctrees/user/waveforms.doctree
diff --git a/docs/html/.buildinfo b/docs/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: c6fda011b514044edda33d31641da3c8
+config: afb4170e7d4e7311d87580c02c5853eb
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/html/README.html b/docs/html/README.html
@@ -1,24 +1,22 @@
+
+
 <!DOCTYPE html>
 <html class="writer-html5" lang="en" data-content_root="./">
 <head>
-  <meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>GPU-Accelerated Black Hole Binary Waveforms (bbhx) &mdash; bbhx  documentation</title>
       <link rel="stylesheet" type="text/css" href="_static/pygments.css?v=80d5e7a1" />
-      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
+      <link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=e59714d7" />
 
 
-  <!--[if lt IE 9]>
-    <script src="_static/js/html5shiv.min.js"></script>
-  <![endif]-->
-
-        <script src="_static/jquery.js?v=5d32c60e"></script>
-        <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
-        <script src="_static/documentation_options.js?v=5929fcd5"></script>
-        <script src="_static/doctools.js?v=888ff710"></script>
-        <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
-        <script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
+      <script src="_static/jquery.js?v=5d32c60e"></script>
+      <script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
+      <script src="_static/documentation_options.js?v=5929fcd5"></script>
+      <script src="_static/doctools.js?v=9a2dae69"></script>
+      <script src="_static/sphinx_highlight.js?v=dc90522c"></script>
+      <script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script>
     <script src="_static/js/theme.js"></script>
     <link rel="index" title="Index" href="genindex.html" />
     <link rel="search" title="Search" href="search.html" /> 
@@ -288,7 +286,7 @@ <h3>Versioning<a class="headerlink" href="#versioning" title="Link to this headi
 <p>We use <a class="reference external" href="http://semver.org/">SemVer</a> for versioning. For the versions
 available, see the <a class="reference external" href="https://github.com/mikekatz04/BBHx/tags">tags on this
 repository</a>.</p>
-<p>Current Version: 1.1.2</p>
+<p>Current Version: 1.1.11</p>
 </section>
 <section id="authors">
 <h3>Authors<a class="headerlink" href="#authors" title="Link to this heading"></a></h3>

diff --git a/docs/html/_sources/README.rst.txt b/docs/html/_sources/README.rst.txt
@@ -226,7 +226,7 @@ We use `SemVer <http://semver.org/>`__ for versioning. For the versions
 available, see the `tags on this
 repository <https://github.com/mikekatz04/BBHx/tags>`__.
 
-Current Version: 1.1.2
+Current Version: 1.1.11
 
 Authors
 -------

diff --git a/docs/html/_static/basic.css b/docs/html/_static/basic.css
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2023 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2024 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

diff --git a/docs/html/_static/css/badge_only.css b/docs/html/_static/css/badge_only.css