Skip to content

replace deprecated macros #193

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

Merged
merged 1 commit into from
May 28, 2025
Merged

replace deprecated macros #193

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
46 changes: 30 additions & 16 deletions mkl_fft/_pydfti.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ cdef cnp.ndarray _pad_array(
b_shape[axis] = n

# allocating temporary buffer
x_arr_is_fortran = cnp.PyArray_CHKFLAGS(x_arr, cnp.NPY_F_CONTIGUOUS)
x_arr_is_fortran = cnp.PyArray_CHKFLAGS(x_arr, cnp.NPY_ARRAY_F_CONTIGUOUS)
b_arr = <cnp.ndarray> cnp.PyArray_EMPTY(
b_ndim, b_shape, <cnp.NPY_TYPES> b_type, x_arr_is_fortran
) # 0 for C-contiguous
Expand Down Expand Up @@ -249,9 +249,12 @@ cdef cnp.ndarray _process_arguments(

# convert x to ndarray, ensure that strides are multiples of itemsize
x_arr = PyArray_CheckFromAny(
x, NULL, 0, 0,
cnp.NPY_ELEMENTSTRIDES | cnp.NPY_ENSUREARRAY | cnp.NPY_NOTSWAPPED,
NULL)
x, NULL, 0, 0,
cnp.NPY_ARRAY_ELEMENTSTRIDES |
cnp.NPY_ARRAY_ENSUREARRAY |
cnp.NPY_ARRAY_NOTSWAPPED,
NULL
)

if (<void *> x_arr) is NULL:
raise ValueError("An input argument x is not an array-like object")
Expand Down Expand Up @@ -319,7 +322,7 @@ cdef cnp.ndarray _allocate_result(
f_shape[axis_] = n_

# allocating output buffer
x_arr_is_fortran = cnp.PyArray_CHKFLAGS(x_arr, cnp.NPY_F_CONTIGUOUS)
x_arr_is_fortran = cnp.PyArray_CHKFLAGS(x_arr, cnp.NPY_ARRAY_F_CONTIGUOUS)
f_arr = <cnp.ndarray> cnp.PyArray_EMPTY(
f_ndim, f_shape, <cnp.NPY_TYPES> f_type, x_arr_is_fortran
) # 0 for C-contiguous
Expand Down Expand Up @@ -419,7 +422,9 @@ def _c2c_fft1d_impl(
# so we cast to complex double and operate in place
try:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_CDOUBLE, cnp.NPY_BEHAVED | cnp.NPY_ENSURECOPY)
x_arr, cnp.NPY_CDOUBLE,
cnp.NPY_ARRAY_BEHAVED | cnp.NPY_ARRAY_ENSURECOPY
)
except:
raise ValueError(
"First argument must be a complex "
Expand Down Expand Up @@ -601,9 +606,9 @@ def _r2c_fft1d_impl(
else:
# we must cast the input to doubles and allocate the output,
try:
requirement = cnp.NPY_BEHAVED | cnp.NPY_ENSURECOPY
requirement = cnp.NPY_ARRAY_BEHAVED | cnp.NPY_ARRAY_ENSURECOPY
if x_type is cnp.NPY_LONGDOUBLE:
requirement = requirement | cnp.NPY_FORCECAST
requirement = requirement | cnp.NPY_ARRAY_FORCECAST
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_DOUBLE, requirement)
x_type = cnp.PyArray_TYPE(x_arr)
Expand Down Expand Up @@ -705,11 +710,11 @@ def _c2r_fft1d_impl(
# so we cast to complex double and operate in place
if x_type is cnp.NPY_FLOAT:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_CFLOAT, cnp.NPY_BEHAVED
x_arr, cnp.NPY_CFLOAT, cnp.NPY_ARRAY_BEHAVED
)
else:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_CDOUBLE, cnp.NPY_BEHAVED
x_arr, cnp.NPY_CDOUBLE, cnp.NPY_ARRAY_BEHAVED
)
x_type = cnp.PyArray_TYPE(x_arr)
in_place = 1
Expand Down Expand Up @@ -788,9 +793,12 @@ def _direct_fftnd(

# convert x to ndarray, ensure that strides are multiples of itemsize
x_arr = PyArray_CheckFromAny(
x, NULL, 0, 0,
cnp.NPY_ELEMENTSTRIDES | cnp.NPY_ENSUREARRAY | cnp.NPY_NOTSWAPPED,
NULL)
x, NULL, 0, 0,
cnp.NPY_ARRAY_ELEMENTSTRIDES |
cnp.NPY_ARRAY_ENSUREARRAY |
cnp.NPY_ARRAY_NOTSWAPPED,
NULL
)

if <void *> x_arr is NULL:
raise ValueError("An input argument x is not an array-like object")
Expand All @@ -808,7 +816,9 @@ def _direct_fftnd(
pass
else:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_CDOUBLE, cnp.NPY_BEHAVED | cnp.NPY_ENSURECOPY)
x_arr, cnp.NPY_CDOUBLE,
cnp.NPY_ARRAY_BEHAVED | cnp.NPY_ARRAY_ENSURECOPY
)
x_type = cnp.PyArray_TYPE(x_arr)
assert x_type == cnp.NPY_CDOUBLE
in_place = 1
Expand Down Expand Up @@ -1003,7 +1013,9 @@ def _rr_fft1d_impl(x, n=None, axis=-1, overwrite_x=False, double fsc=1.0):
else:
try:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_DOUBLE, cnp.NPY_BEHAVED | cnp.NPY_ENSURECOPY)
x_arr, cnp.NPY_DOUBLE,
cnp.NPY_ARRAY_BEHAVED | cnp.NPY_ARRAY_ENSURECOPY
)
except:
raise TypeError("1st argument must be a real sequence")
x_type = cnp.PyArray_TYPE(x_arr)
Expand Down Expand Up @@ -1065,7 +1077,9 @@ def _rr_ifft1d_impl(x, n=None, axis=-1, overwrite_x=False, double fsc=1.0):
# so we cast to complex double and operate in place
try:
x_arr = <cnp.ndarray> cnp.PyArray_FROM_OTF(
x_arr, cnp.NPY_DOUBLE, cnp.NPY_BEHAVED | cnp.NPY_ENSURECOPY)
x_arr, cnp.NPY_DOUBLE,
cnp.NPY_ARRAY_BEHAVED | cnp.NPY_ARRAY_ENSURECOPY
)
except:
raise ValueError(
"First argument should be a real "
Expand Down
Loading