fastlisaresponse 1.0.5__cp312-cp312-macosx_10_9_x86_64.whl → 1.0.7__cp312-cp312-macosx_10_9_x86_64.whl

fastlisaresponse/_version.py

@@ -1 +1 @@
-__version__ = '1.0.4'
+__version__ = "1.0.7"

fastlisaresponse/response.py

@@ -8,18 +8,18 @@ from copy import deepcopy
 
 try:
     import cupy as cp
-    from pyresponse import get_response_wrap as get_response_wrap_gpu
-    from pyresponse import get_tdi_delays_wrap as get_tdi_delays_wrap_gpu
+    from .pyresponse_gpu import get_response_wrap as get_response_wrap_gpu
+    from .pyresponse_gpu import get_tdi_delays_wrap as get_tdi_delays_wrap_gpu
 
     gpu = True
 
 except (ImportError, ModuleNotFoundError) as e:
-    import numpy as xp
+    pass
 
     gpu = False
 
-from pyresponse_cpu import get_response_wrap as get_response_wrap_cpu
-from pyresponse_cpu import get_tdi_delays_wrap as get_tdi_delays_wrap_cpu
+from .pyresponse_cpu import get_response_wrap as get_response_wrap_cpu
+from .pyresponse_cpu import get_tdi_delays_wrap as get_tdi_delays_wrap_cpu
 import time
 import h5py
 
@@ -113,7 +113,6 @@ class pyResponseTDI(object):
         num_channels (int): 3.
         num_pts (int): Number of points to produce for the final output template.
         order (int): Order of Lagrangian interpolation technique.
-        response_gen (func): Projection generator function.
         sampling_frequency (double): The sampling rate in Hz.
         tdi (str or list): TDI setup.
         tdi_buffer (int): The buffer necessary for all information needed at early times
@@ -153,13 +152,6 @@ class pyResponseTDI(object):
 
         # setup functions for GPU or CPU
         self.use_gpu = use_gpu
-        if use_gpu:
-            self.response_gen = get_response_wrap_gpu
-            self.tdi_gen = get_tdi_delays_wrap_gpu
-
-        else:
-            self.response_gen = get_response_wrap_cpu
-            self.tdi_gen = get_tdi_delays_wrap_cpu
 
         # prepare the interpolation of A and E in the Lagrangian interpolation
         self._fill_A_E()
@@ -183,6 +175,16 @@ class pyResponseTDI(object):
         # setup TDI info
         self._init_TDI_delays()
 
+    @property
+    def response_gen(self) -> callable:
+        """CPU/GPU function for generating the projections."""
+        return get_response_wrap_cpu if not self.use_gpu else get_response_wrap_gpu
+
+    @property
+    def tdi_gen(self) -> callable:
+        """CPU/GPU function for generating tdi."""
+        return get_tdi_delays_wrap_cpu if not self.use_gpu else get_tdi_delays_wrap_gpu
+
     @property
     def xp(self) -> object:
         return np if not self.use_gpu else cp
@@ -219,6 +221,7 @@ class pyResponseTDI(object):
             orbits = EqualArmlengthOrbits()
 
         assert isinstance(orbits, Orbits)
+        assert orbits.use_gpu == self.use_gpu
 
         self._tdi_orbits = deepcopy(orbits)
 
@@ -644,6 +647,9 @@ class ResponseWrapper:
             the number of points, ``n``, from ``int(T/dt)`` to the ``n_overide``. This is used
             if there is an issue matching points between the waveform generator and the response
             model.
+        orbits (:class:`Orbits`, optional): Orbits class from LISA Analysis Tools. Works with LISA Orbits
+            outputs: `lisa-simulation.pages.in2p3.fr/orbits/ <https://lisa-simulation.pages.in2p3.fr/orbits/latest/>`_.
+            (default: :class:`EqualArmlengthOrbits`)
         **kwargs (dict, optional): Keyword arguments passed to :class:`pyResponseTDI`.
 
     """

fastlisaresponse/utils/utility.py

@@ -71,9 +71,10 @@ def get_overlap(sig1, sig2, phase_maximize=False, use_gpu=False):
             np.dot(np.fft.rfft(sig1_i).conj(), np.fft.rfft(sig1_i))
             * np.dot(np.fft.rfft(sig2_i).conj(), np.fft.rfft(sig2_i))
         )
-
         overlap += overlap_i
 
+    overlap /= len(sig1)
+
     if phase_maximize:
         return np.abs(overlap)
 

{fastlisaresponse-1.0.5.dist-info → fastlisaresponse-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastlisaresponse
-Version: 1.0.5
+Version: 1.0.7
 Home-page: https://github.com/mikekatz04/lisa-on-gpu
 Author: Michael Katz
 Author-email: mikekatz04@gmail.com
@@ -18,41 +18,18 @@ Description-Content-Type: text/markdown
 
 This code base provides a GPU-accelerated version of the generic time-domain LISA response function. The GPU-acceleration allows this code to be used directly in Parameter Estimation.
 
-Please see the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) for further information on these modules. The code can be found on Github [here](https://github.com/mikekatz04/lisa-on-gpu). It can be found on # TODO fix [Zenodo](https://zenodo.org/record/3981654#.XzS_KRNKjlw).
+Please see the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) for further information on these modules. The code can be found on Github [here](https://github.com/mikekatz04/lisa-on-gpu). It can be found on [Zenodo](https://zenodo.org/record/3981654#.XzS_KRNKjlw).
 
 If you use all or any parts of this code, please cite [arXiv:2204.06633](https://arxiv.org/abs/2204.06633). See the [documentation](https://mikekatz04.github.io/lisa-on-gpu/) to properly cite specific modules.
 
-**Warning**: newest version (1.0.5) of code with `lisatools` orbits needs detailed testing before deployed for a paper.
 
 ## Getting Started
 
-Below is a quick set of instructions to get you started with `fastlisaresponse`.
-
-0) [Install Anaconda](https://docs.anaconda.com/anaconda/install/) if you do not have it.
-
-1) Create a virtual environment. **Note**: There is no available `conda` compiler for Windows. If you want to install for Windows, you will probably need to add libraries and include paths to the `setup.py` file.
-
-```
-conda create -n lisa_env -c conda-forge gcc_linux-64 gxx_linux-64 numpy Cython scipy jupyter ipython h5py matplotlib python=3.9
-conda activate lisa_env
-```
-
-    If on MACOSX, substitute `gcc_linux-64` and `gxx_linus-64` with `clang_osx-64` and `clangxx_osx-64`.
-
-2) Clone the repository.
-
-```
-git clone https://github.com/mikekatz04/lisa-on-gpu.git
-cd lisa-on-gpu
+Install with pip (CPU only for now):
 ```
-
-3) Run install.
-
+pip install fastlisaresponse
 ```
-python setup.py install
-```
-
-4) To import fastlisaresponse:
+To import fastlisaresponse:
 
 ```
 from fastlisaresponse import ResponseWrapper
@@ -63,6 +40,8 @@ See [examples notebook](https://github.com/mikekatz04/lisa-on-gpu/blob/master/ex
 
 ### Prerequisites
 
+Now (version 1.0.7) `fastlisaresponse` requires the newest version of [LISA Analysis Tools](github.com/mikekatz04/LISAanalysistools). You can run `pip install lisaanalysistools`.
+
 To install this software for CPU usage, you need Python >3.4 and NumPy. To run the examples, you will also need jupyter and matplotlib. We generally recommend installing everything, including gcc and g++ compilers, in the conda environment as is shown in the examples here. This generally helps avoid compilation and linking issues. If you use your own chosen compiler, you will need to make sure all necessary information is passed to the setup command (see below). You also may need to add information to the `setup.py` file.
 
 To install this software for use with NVIDIA GPUs (compute capability >2.0), you need the [CUDA toolkit](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html) and [CuPy](https://cupy.chainer.org/). The CUDA toolkit must have cuda version >8.0. Be sure to properly install CuPy within the correct CUDA toolkit version. Make sure the nvcc binary is on `$PATH` or set it as the `CUDAHOME` environment variable.
@@ -71,13 +50,20 @@ To install this software for use with NVIDIA GPUs (compute capability >2.0), you
 ### Installing
 
 
+Install with pip (CPU only for now):
+```
+pip install fastlisaresponse
+```
+
+To install from source:
+
 0) [Install Anaconda](https://docs.anaconda.com/anaconda/install/) if you do not have it.
 
 1) Create a virtual environment.
 
 ```
-conda create -n lisa_env -c conda-forge gcc_linux-64 gxx_linux-64 numpy Cython scipy jupyter ipython h5py matplotlib python=3.9
-conda activate few_env
+conda create -n lisa_resp_env -c conda-forge gcc_linux-64 gxx_linux-64 numpy Cython scipy jupyter ipython h5py matplotlib python=3.12
+conda activate lisa_resp_env
 ```
 
     If on MACOSX, substitute `gcc_linux-64` and `gxx_linus-64` with `clang_osx-64` and `clangxx_osx-64`.
@@ -87,26 +73,29 @@ conda activate few_env
 2) Clone the repository.
 
 ```
-git clone https://github.com/BlackHolePerturbationToolkit/FastEMRIWaveforms.git
-cd FastEMRIWaveforms
+git clone https://github.com/mikekatz04/lisa-on-gpu.git
+cd lisa-on-gpu
 ```
 
-3) If using GPUs, use pip to [install cupy](https://docs-cupy.chainer.org/en/stable/install.html). If you have cuda version 9.2, for example:
+3) If using GPUs, use pip to [install cupy](https://docs-cupy.chainer.org/en/stable/install.html). 
 
 ```
-pip install cupy-cuda92
+pip install cupy-12x
 ```
 
 4) Run install. Make sure CUDA is on your PATH.
 
 ```
-python setup.py install
+python scripts/prebuild.py
+pip install .
 ```
 
 ## Running the Tests
 
-Since the code package in minimal in size, the example notebook should be run to verify it is running correctly.
-
+Run the example notebook or the tests using `unittest` from the main directory of the code:
+```
+python -m unittest discover
+```
 
 ## Contributing
 
@@ -116,7 +105,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/lisa-on-gpu/tags).
 
-Current Version: 1.0.5
+Current Version: 1.0.7
 
 ## Authors
 

fastlisaresponse-1.0.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+fastlisaresponse/__init__.py,sha256=wwmiIBy9IuFwoc4jQyJVkJBhjB8B1XZjerTe_E8FkI8,53
+fastlisaresponse/_version.py,sha256=BW7SWRpHoxuOQZ67pS20yog2LWYl-nK7-BEFBNrHGgA,22
+fastlisaresponse/pointer_adjust.py,sha256=TjcSehyffLxwgJnrAmcFlPvxXb3XPElMoHXLBOQN-PI,736
+fastlisaresponse/pyresponse_cpu.cpython-312-darwin.so,sha256=bUwp5cB9a44LFf40o2h94K_Wi7P-y3B6YwZV3tg7-8Y,97208
+fastlisaresponse/response.py,sha256=eMHrMnEFcm_ltJ3836FKsoYzleazS1UBwMsUm6C0qZc,28637
+fastlisaresponse/utils/__init__.py,sha256=pf2NmWKs_uQNzlyA5iNO1gTRDISKNmIIsvOcKqQ3hgw,33
+fastlisaresponse/utils/utility.py,sha256=NrJdBmEnLkLPk6Ile1TZg8jNLw6xERiSp58iGVlz01s,2709
+fastlisaresponse-1.0.7.dist-info/METADATA,sha256=e3gGNVueMESVcRhxs6bACjUYZTszgbtkZa2sy5q0Lz4,4728
+fastlisaresponse-1.0.7.dist-info/WHEEL,sha256=EahQufTUtBnyvrECh1gpiswxGRRuu1fCWmVm0K3Ige4,110
+fastlisaresponse-1.0.7.dist-info/top_level.txt,sha256=J4M7Xx_52RqYZrLf99ryAbQjq8GbVjgZdhxekkYw8lg,17
+fastlisaresponse-1.0.7.dist-info/RECORD,,

{fastlisaresponse-1.0.5.dist-info → fastlisaresponse-1.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_10_9_x86_64
 

{fastlisaresponse-1.0.5.dist-info → fastlisaresponse-1.0.7.dist-info}/top_level.txt

@@ -1,2 +1 @@
 fastlisaresponse
-pyresponse_cpu

fastlisaresponse-1.0.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-pyresponse_cpu.cpython-312-darwin.so,sha256=90lYlLn-PhIXPVyNirAfcBhTkX2empvF4zHQLHiaKxk,91584
-fastlisaresponse/__init__.py,sha256=wwmiIBy9IuFwoc4jQyJVkJBhjB8B1XZjerTe_E8FkI8,53
-fastlisaresponse/_version.py,sha256=Oi2b5pm3sFbESQW0xgj8kqwDPX_Hxmx4gNILYpLzYqI,21
-fastlisaresponse/pointer_adjust.py,sha256=TjcSehyffLxwgJnrAmcFlPvxXb3XPElMoHXLBOQN-PI,736
-fastlisaresponse/response.py,sha256=3t_orbg4XIo5pgQ1YSyXacx3HIzV-Zd_5jbaYgG3qRw,28228
-fastlisaresponse/cutils/detector.cpython-312-darwin.so,sha256=Gygx3sd2pD62NQLk86UT3KyNvV2KYw_rkTvMAvpBD9Y,121952
-fastlisaresponse/utils/__init__.py,sha256=pf2NmWKs_uQNzlyA5iNO1gTRDISKNmIIsvOcKqQ3hgw,33
-fastlisaresponse/utils/utility.py,sha256=uhu827ZNwMHfccD9aLRNG_yIwcfK5a3aaAJ7RSRAun4,2684
-fastlisaresponse-1.0.5.dist-info/METADATA,sha256=izJg16MyFrtwkWnVt0EqbPzD_MNnguG1GI8d7ugFFMc,5350
-fastlisaresponse-1.0.5.dist-info/WHEEL,sha256=KYtn_mzb_QwZSHwPlosUO3fDl70znfUFngLlrLVHeBY,111
-fastlisaresponse-1.0.5.dist-info/top_level.txt,sha256=xbAh3KhbfqEkGUbhVISA5j-Qx62Bwy7szKCZGg5WZWA,32
-fastlisaresponse-1.0.5.dist-info/RECORD,,