Skip to content

BUG: preserve dtypes when assigning wavelet packet nodes #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vera-rubin wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −3
Open

BUG: preserve dtypes when assigning wavelet packet nodes #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pywt/_wavelet_packets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,8 @@ def __setitem__(self, path, data):
subnode[path[self.PART_LEN:]] = data
else:
if isinstance(data, BaseNode):
self.data = np.asarray(data.data)
else:
self.data = np.asarray(data)
data = data.data
self.data = np.asarray(data)
# convert data to nearest supported dtype
dtype = _check_dtype(data)
if self.data.dtype != dtype:
Expand Down
24 changes: 24 additions & 0 deletions pywt/tests/test_wp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pickle

import numpy as np
import pytest
from numpy.testing import assert_, assert_allclose, assert_equal, assert_raises

import pywt
Expand Down Expand Up @@ -198,6 +199,29 @@ def test_wavelet_packet_dtypes():
assert_allclose(r, x.astype(transform_dtype), atol=1e-5, rtol=1e-5)


@pytest.mark.parametrize('packet_class, shape, kwargs', [
(pywt.WaveletPacket, (2,), {}),
(pywt.WaveletPacket2D, (2, 2), {}),
(pywt.WaveletPacketND, (2, 2, 2), {'axes': (0, 1, 2)}),
])
@pytest.mark.parametrize('dtype', [np.float32, np.float64,
np.complex64, np.complex128])
@pytest.mark.parametrize('mode', ['symmetric', 'periodization'])
def test_wavelet_packet_node_assignment(packet_class, shape, kwargs, dtype, mode):
x = np.arange(1, np.prod(shape) + 1, dtype=dtype).reshape(shape)
if np.iscomplexobj(x):
x += 1j * (x + 1)
wp = packet_class(x, 'haar', mode=mode, maxlevel=1, **kwargs)
new_wp = packet_class(None, 'haar', mode=mode, maxlevel=1, **kwargs)

for node in wp.get_level(1):
new_wp[node.path] = node
assert_equal(new_wp[node.path].data.dtype, node.data.dtype)
assert_equal(new_wp[node.path].data, node.data)

assert_allclose(new_wp.reconstruct(), x, atol=1e-6, rtol=1e-6)


def test_db3_roundtrip():
original = np.arange(512)
wp = pywt.WaveletPacket(data=original, wavelet='db3', mode='smooth',
Expand Down