pywavelet 0.2.0__tar.gz → 0.2.2__tar.gz

{pywavelet-0.2.0 → pywavelet-0.2.2}/CHANGELOG.rst

@@ -5,16 +5,66 @@ CHANGELOG
 =========
 
 
+.. _changelog-v0.2.2:
+
+v0.2.2 (2025-01-23)
+===================
+
+Unknown
+-------
+
+* Merge branch 'main' of github.com:pywavelet/pywavelet (`e8e2115`_)
+
+.. _e8e2115: https://github.com/pywavelet/pywavelet/commit/e8e2115e797a5001f236ff027a14ef226151dcc1
+
+
+.. _changelog-v0.2.1:
+
+v0.2.1 (2025-01-23)
+===================
+
+Bug Fixes
+---------
+
+* fix: fix readme path (`34e927d`_)
+
+Chores
+------
+
+* chore(release): 0.2.1 (`a55bce5`_)
+
+Unknown
+-------
+
+* Merge branch 'main' of github.com:pywavelet/pywavelet (`b8c6d15`_)
+
+.. _34e927d: https://github.com/pywavelet/pywavelet/commit/34e927d411ec8fde89f552bd5ec89b38820e07e0
+.. _a55bce5: https://github.com/pywavelet/pywavelet/commit/a55bce518c3484543efada283399a41df3ecf001
+.. _b8c6d15: https://github.com/pywavelet/pywavelet/commit/b8c6d1579d48ec5fa22130430267794ae8e54f6c
+
+
 .. _changelog-v0.2.0:
 
 v0.2.0 (2025-01-23)
 ===================
 
+Bug Fixes
+---------
+
+* fix: add temp inverse transform (`586f9ad`_)
+
+Chores
+------
+
+* chore(release): 0.2.0 (`fcc35e9`_)
+
 Features
 --------
 
 * feat: add jax as optional backend (`264613e`_)
 
+.. _586f9ad: https://github.com/pywavelet/pywavelet/commit/586f9ad311f905f7d2fbbfd02fea8198eeda8237
+.. _fcc35e9: https://github.com/pywavelet/pywavelet/commit/fcc35e973d906bd18e03204449564f35fc657b89
 .. _264613e: https://github.com/pywavelet/pywavelet/commit/264613e5a58042641eb6814530dab36bb54b3371
 
 

{pywavelet-0.2.0 → pywavelet-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywavelet
-Version: 0.2.0
+Version: 0.2.2
 Summary: WDM wavelet transform your time/freq series!
 Author-email: Pywavelet Team <avi.vajpeyi@gmail.com>
 Project-URL: Homepage, https://pywavelet.github.io/pywavelet/
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
-Description-Content-Type: text/markdown
+Description-Content-Type: text/x-rst
 Requires-Dist: numpy
 Requires-Dist: numba
 Requires-Dist: scipy
@@ -34,3 +34,52 @@ Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: jupyter-book; extra == "dev"
 Requires-Dist: GitPython; extra == "dev"
+
+pywavelet
+#########
+
+.. image:: https://badge.fury.io/py/pywavelet.svg
+    :target: https://badge.fury.io/py/pywavelet
+.. image:: https://coveralls.io/repos/github/avivajpeyi/pywavelet/badge.svg?branch=main&kill_cache=1
+    :target: https://coveralls.io/github/avivajpeyi/pywavelet?branch=main
+
+
+
+
+
+WDM Wavelet transform
+
+
+Quickstart
+==========
+
+pywavelet is available on PyPI and can be installed with `pip <https://pip.pypa.io>`_.
+
+.. code-block:: console
+
+    $ pip install pywavelet
+
+For developers
+--------------
+
+First set up a conda environment with the latest version of python.
+
+.. code-block::
+
+    $ conda create -n pywavelet -c conda-forge python=3.12
+
+.. code-block::
+
+    $ pip install -e ".[dev]"
+    $ pre-commit install
+
+Test code
+---------
+
+Locate directory /tests from root directory. run 
+
+.. code-block::
+
+    $ pytest .
+
+Hopefully everything should run fine. 

{pywavelet-0.2.0 → pywavelet-0.2.2}/pyproject.toml

@@ -11,7 +11,7 @@ name = "pywavelet"
 dynamic = ["version"] # scm versioning (using tags)
 requires-python = ">=3.8"
 description = "WDM wavelet transform your time/freq series!"
-readme = "README.md"
+readme = "README.rst"
 authors = [
     { name = "Pywavelet Team", email = "avi.vajpeyi@gmail.com" },
 ]

{pywavelet-0.2.0 → pywavelet-0.2.2}/src/pywavelet/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.2.2'
+__version_tuple__ = version_tuple = (0, 2, 2)

pywavelet-0.2.2/src/pywavelet/transforms/jax/inverse/main.py

@@ -0,0 +1,69 @@
+import jax.numpy as jnp
+from jax.numpy.fft import rfftfreq
+
+from ...phi_computer import phi_vec, phitilde_vec_norm
+from ....types import FrequencySeries, TimeSeries, Wavelet
+from .to_freq import inverse_wavelet_freq_helper
+# from .inverse_wavelet_time_funcs import inverse_wavelet_time_helper
+
+
+def from_wavelet_to_time(
+    wave_in: Wavelet,
+    dt: float,
+    nx: float = 4.0,
+    mult: int = 32,
+) -> TimeSeries:
+    """Inverse wavelet transform to time domain.
+
+    Parameters
+    ----------
+    wave_in : Wavelet
+        input wavelet
+    dt : float
+        time step
+    nx : float, optional
+        parameter for phi_vec, by default 4.0
+    mult : int, optional
+        parameter for phi_vec, by default 32
+
+    Returns
+    -------
+    TimeSeries
+        Time domain signal
+    """
+    # Can we just do this?
+    freq = from_wavelet_to_freq(wave_in, dt=dt, nx=nx)
+    return freq.to_timeseries()
+
+
+def from_wavelet_to_freq(
+    wave_in: Wavelet, dt: float, nx=4.0
+) -> FrequencySeries:
+    """Inverse wavelet transform to frequency domain.
+
+    Parameters
+    ----------
+    wave_in : Wavelet
+        input wavelet
+    dt : float
+        time step
+    nx : float, optional
+        parameter for phitilde_vec_norm, by default 4.0
+
+    Returns
+    -------
+    FrequencySeries
+        Frequency domain signal
+
+    """
+    phif = jnp.array(phitilde_vec_norm(wave_in.Nf, wave_in.Nt, dt=dt, d=nx))
+    freq_data = inverse_wavelet_freq_helper(
+        wave_in.data, phif=phif, Nf=wave_in.Nf, Nt=wave_in.Nt
+    )
+
+    freq_data *= 2 ** (
+        -1 / 2
+    )  # Normalise to get the proper backwards transformation
+
+    freqs = rfftfreq(wave_in.ND*2, d=dt)[1:]
+    return FrequencySeries(data=freq_data, freq=freqs)

pywavelet-0.2.2/src/pywavelet/transforms/jax/inverse/to_freq.py

@@ -0,0 +1,70 @@
+import jax
+import jax.numpy as jnp
+from jax import jit
+from jax.numpy.fft import fft
+
+from functools import partial
+
+
+@partial(jit, static_argnames=('Nf', 'Nt'))
+def inverse_wavelet_freq_helper(
+        wave_in: jnp.ndarray, phif: jnp.ndarray, Nf: int, Nt: int
+) -> jnp.ndarray:
+    """JAX vectorized function for inverse_wavelet_freq"""
+    wave_in = wave_in.T
+    ND = Nf * Nt
+
+    m_range = jnp.arange(Nf + 1)
+    prefactor2s = jnp.zeros((Nf + 1, Nt), dtype=jnp.complex128)
+
+    n_range = jnp.arange(Nt)
+
+    # m == 0 case
+    prefactor2s = prefactor2s.at[0].set(2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt, 0])
+
+    # m == Nf case
+    prefactor2s = prefactor2s.at[Nf].set(2 ** (-1 / 2) * wave_in[(2 * n_range) % Nt + 1, 0])
+
+    # Other m cases
+    m_mid = m_range[1:Nf]
+    n_grid, m_grid = jnp.meshgrid(n_range, m_mid)
+    val = wave_in[n_grid, m_grid]
+    mult2 = jnp.where((n_grid + m_grid) % 2, -1j, 1)
+    prefactor2s = prefactor2s.at[1:Nf].set(mult2 * val)
+
+    # Vectorized FFT
+    fft_prefactor2s = fft(prefactor2s, axis=1)
+
+    # Vectorized __unpack_wave_inverse
+    ## TODO: Check with Giorgio
+    # ND or ND // 2 + 1?
+    # https://github.com/pywavelet/pywavelet/blob/63151a47cde9edc14f1e7e0bf17f554e78ad257c/src/pywavelet/transforms/from_wavelets/inverse_wavelet_freq_funcs.py
+    res = jnp.zeros(ND, dtype=jnp.complex128)
+
+    # m == 0 or m == Nf cases
+    i_ind_range = jnp.arange(Nt // 2)
+    i_0 = jnp.abs(i_ind_range)
+    i_Nf = jnp.abs(Nf * Nt // 2 - i_ind_range)
+    ind3_0 = (2 * i_0) % Nt
+    ind3_Nf = (2 * i_Nf) % Nt
+
+    res = res.at[i_0].add(fft_prefactor2s[0, ind3_0] * phif[i_ind_range])
+    res = res.at[i_Nf].add(fft_prefactor2s[Nf, ind3_Nf] * phif[i_ind_range])
+
+    # Special case for m == Nf
+    res = res.at[Nf * Nt // 2].add(fft_prefactor2s[Nf, 0] * phif[Nt // 2])
+
+    # Other m cases
+    m_mid = m_range[1:Nf]
+    i_ind_range = jnp.arange(Nt // 2 + 1)
+    m_grid, i_ind_grid = jnp.meshgrid(m_mid, i_ind_range)
+
+    i1 = Nt // 2 * m_grid - i_ind_grid
+    i2 = Nt // 2 * m_grid + i_ind_grid
+    ind31 = (Nt // 2 * m_grid - i_ind_grid) % Nt
+    ind32 = (Nt // 2 * m_grid + i_ind_grid) % Nt
+
+    res = res.at[i1].add(fft_prefactor2s[m_grid, ind31] * phif[i_ind_grid])
+    res = res.at[i2].add(fft_prefactor2s[m_grid, ind32] * phif[i_ind_grid])
+
+    return res

{pywavelet-0.2.0 → pywavelet-0.2.2}/src/pywavelet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pywavelet
-Version: 0.2.0
+Version: 0.2.2
 Summary: WDM wavelet transform your time/freq series!
 Author-email: Pywavelet Team <avi.vajpeyi@gmail.com>
 Project-URL: Homepage, https://pywavelet.github.io/pywavelet/
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
-Description-Content-Type: text/markdown
+Description-Content-Type: text/x-rst
 Requires-Dist: numpy
 Requires-Dist: numba
 Requires-Dist: scipy
@@ -34,3 +34,52 @@ Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: jupyter-book; extra == "dev"
 Requires-Dist: GitPython; extra == "dev"
+
+pywavelet
+#########
+
+.. image:: https://badge.fury.io/py/pywavelet.svg
+    :target: https://badge.fury.io/py/pywavelet
+.. image:: https://coveralls.io/repos/github/avivajpeyi/pywavelet/badge.svg?branch=main&kill_cache=1
+    :target: https://coveralls.io/github/avivajpeyi/pywavelet?branch=main
+
+
+
+
+
+WDM Wavelet transform
+
+
+Quickstart
+==========
+
+pywavelet is available on PyPI and can be installed with `pip <https://pip.pypa.io>`_.
+
+.. code-block:: console
+
+    $ pip install pywavelet
+
+For developers
+--------------
+
+First set up a conda environment with the latest version of python.
+
+.. code-block::
+
+    $ conda create -n pywavelet -c conda-forge python=3.12
+
+.. code-block::
+
+    $ pip install -e ".[dev]"
+    $ pre-commit install
+
+Test code
+---------
+
+Locate directory /tests from root directory. run 
+
+.. code-block::
+
+    $ pytest .
+
+Hopefully everything should run fine. 

{pywavelet-0.2.0 → pywavelet-0.2.2}/src/pywavelet.egg-info/SOURCES.txt

@@ -33,6 +33,9 @@ src/pywavelet/transforms/jax/forward/__init__.py
 src/pywavelet/transforms/jax/forward/from_freq.py
 src/pywavelet/transforms/jax/forward/from_time.py
 src/pywavelet/transforms/jax/forward/main.py
+src/pywavelet/transforms/jax/inverse/__init__.py
+src/pywavelet/transforms/jax/inverse/main.py
+src/pywavelet/transforms/jax/inverse/to_freq.py
 src/pywavelet/transforms/numpy/__init__.py
 src/pywavelet/transforms/numpy/forward/__init__.py
 src/pywavelet/transforms/numpy/forward/from_freq.py