diff --git a/pywt/_extensions/_dwt.pxd b/pywt/_extensions/_dwt.pxd index bf5aefdd..4e96cf0f 100644 --- a/pywt/_extensions/_dwt.pxd +++ b/pywt/_extensions/_dwt.pxd @@ -1,5 +1,5 @@ from ._pywt cimport Wavelet, cdata_t -cpdef upcoef(bint do_rec_a, cdata_t[::1] coeffs, Wavelet wavelet, int level, +cpdef upcoef(bint do_rec_a, const cdata_t[::1] coeffs, Wavelet wavelet, int level, size_t take) diff --git a/pywt/_extensions/_dwt.pyx b/pywt/_extensions/_dwt.pyx index 9a8c0167..9648bfe2 100644 --- a/pywt/_extensions/_dwt.pyx +++ b/pywt/_extensions/_dwt.pyx @@ -330,7 +330,7 @@ cpdef idwt_axis(np.ndarray coefs_a, np.ndarray coefs_d, return output -cpdef upcoef(bint do_rec_a, cdata_t[::1] coeffs, Wavelet wavelet, int level, +cpdef upcoef(bint do_rec_a, const cdata_t[::1] coeffs, Wavelet wavelet, int level, size_t take): cdef cdata_t[::1] rec cdef int i, retval @@ -424,7 +424,7 @@ cpdef upcoef(bint do_rec_a, cdata_t[::1] coeffs, Wavelet wavelet, int level, return rec -cpdef downcoef(bint do_dec_a, cdata_t[::1] data, Wavelet wavelet, MODE mode, int level): +cpdef downcoef(bint do_dec_a, const cdata_t[::1] data, Wavelet wavelet, MODE mode, int level): cdef cdata_t[::1] coeffs cdef int i, retval cdef size_t output_len, data_size diff --git a/pywt/tests/test__pywt.py b/pywt/tests/test__pywt.py index 7131084d..148d20ed 100644 --- a/pywt/tests/test__pywt.py +++ b/pywt/tests/test__pywt.py @@ -2,6 +2,7 @@ import numpy as np +import pytest from numpy.testing import assert_, assert_allclose, assert_raises import pywt @@ -88,6 +89,22 @@ def test_upcoef_complex(): assert_allclose(a, a_ref) +@pytest.mark.parametrize('transform', [pywt.downcoef, pywt.upcoef]) +@pytest.mark.parametrize('part', ['a', 'd']) +@pytest.mark.parametrize('dtype', [np.float32, np.float64, np.complex64, + np.complex128]) +def test_partial_transform_readonly(transform, part, dtype): + data = np.arange(32, dtype=dtype) + if np.issubdtype(dtype, np.complexfloating): + data += 1j * data + expected = transform(part, data, 'db4', level=3) + readonly = data.copy() + readonly.flags.writeable = False + + assert_allclose(transform(part, readonly, 'db4', level=3), expected) + assert_allclose(readonly, data) + + def test_upcoef_errs(): # invalid part string (not 'a' or 'd') assert_raises(ValueError, pywt.upcoef, 'f', np.ones(4), 'haar')