1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From: Scott Huberty <seh33@uw.edu>
Date: Tue, 24 Jun 2025 12:44:28 -0700
Subject: FIX: Remove deprecated Numpy C API macros
If I understand correctly, NPY_OWNDATA and NPY_BEHAVED were deprecated in v1.7, which was released over a decade ago. These macros were officially removed in Numpy v2.3 (released June 2025).
- https://github.com/numpy/numpy/releases/tag/v2.3.0
- https://numpy.org/devdocs/release/1.7.0-notes.html
- https://github.com/numpy/numpy/blob/v1.12.0b1/numpy/core/include/numpy/npy_1_7_deprecated_api.h
---
lib/fff_python_wrapper/fffpy.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/fff_python_wrapper/fffpy.c b/lib/fff_python_wrapper/fffpy.c
index 718c358..9efdea6 100644
--- a/lib/fff_python_wrapper/fffpy.c
+++ b/lib/fff_python_wrapper/fffpy.c
@@ -41,7 +41,7 @@ void fff_vector_fetch_using_NumPy(fff_vector* y, const char* x, npy_intp stride,
npy_intp dim[1] = {(npy_intp)y->size};
npy_intp strides[1] = {stride};
PyArrayObject* X = (PyArrayObject*) PyArray_New(&PyArray_Type, 1, dim, type, strides,
- (void*)x, itemsize, NPY_BEHAVED, NULL);
+ (void*)x, itemsize, NPY_ARRAY_BEHAVED, NULL);
PyArrayObject* Y = (PyArrayObject*) PyArray_SimpleNewFromData(1, dim, NPY_DOUBLE, (void*)y->data);
PyArray_CopyInto(Y, X);
Py_XDECREF(Y);
@@ -140,7 +140,7 @@ PyArrayObject* fff_vector_toPyArray(fff_vector* y)
buffer to Python and transfer ownership */
if (y->owner) {
x = (PyArrayObject*) PyArray_SimpleNewFromData(1, dims, NPY_DOUBLE, (void*)y->data);
- x->flags = (x->flags) | NPY_OWNDATA;
+ x->flags = (x->flags) | NPY_ARRAY_OWNDATA;
}
/* Otherwise, create Python array from scratch */
else
@@ -166,7 +166,7 @@ PyArrayObject* fff_vector_const_toPyArray(const fff_vector* y)
for (i=0; i<size; i++, bufX++, bufY+=stride)
*bufX = *bufY;
x = (PyArrayObject*) PyArray_SimpleNewFromData(1, dims, NPY_DOUBLE, (void*)data);
- x->flags = (x->flags) | NPY_OWNDATA;
+ x->flags = (x->flags) | NPY_ARRAY_OWNDATA;
return x;
}
@@ -244,7 +244,7 @@ PyArrayObject* fff_matrix_toPyArray(fff_matrix* y)
buffer to Python and transfer ownership */
if ((tda == size2) && (y->owner)) {
x = (PyArrayObject*) PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (void*)y->data);
- x->flags = (x->flags) | NPY_OWNDATA;
+ x->flags = (x->flags) | NPY_ARRAY_OWNDATA;
}
/* Otherwise, create PyArray from scratch. Note, the input
fff_matrix is necessarily in row-major order. */
@@ -278,7 +278,7 @@ PyArrayObject* fff_matrix_const_toPyArray(const fff_matrix* y)
}
x = (PyArrayObject*) PyArray_SimpleNewFromData(2, dims, NPY_DOUBLE, (void*)data);
- x->flags = (x->flags) | NPY_OWNDATA;
+ x->flags = (x->flags) | NPY_ARRAY_OWNDATA;
return x;
}
@@ -467,7 +467,7 @@ PyArrayObject* fff_array_toPyArray(fff_array* y)
x = (PyArrayObject*) PyArray_SimpleNewFromData(yy->ndims, dims, datatype, (void*)yy->data);
/* Transfer ownership to Python */
- x->flags = (x->flags) | NPY_OWNDATA;
+ x->flags = (x->flags) | NPY_ARRAY_OWNDATA;
/* Dealloc memory if needed */
if (! y->owner)
|
