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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
Description: Fix FTBFS on NumPy2
Author: Mateus Rodrigues de Morais <mateus.morais@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libgetdata/+bug/2098512
Bug-Debian: https://bugs.debian.org/1094712
Bug-Debian: https://bugs.debian.org/1114701
Last-Update: 2025-10-02
---
bindings/python/pydirfile.c | 32 ++++++++++++++++----------------
bindings/python/pygetdata.c | 24 ++++++++++++------------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/bindings/python/pydirfile.c b/bindings/python/pydirfile.c
index a277125..edf057c 100644
--- a/bindings/python/pydirfile.c
+++ b/bindings/python/pydirfile.c
@@ -558,7 +558,7 @@ static PyObject *gdpy_dirfile_getcarray(struct gdpy_dirfile_t *self,
if (!as_list) {
dims[0] = (npy_intp)len;
pyobj = PyArray_SimpleNew(1, dims, gdpy_npytype_from_type(return_type));
- data = PyArray_DATA(pyobj);
+ data = PyArray_DATA((PyArrayObject*) pyobj);
} else
data = PyMem_Malloc((size_t)len * GD_SIZE(return_type));
@@ -753,7 +753,7 @@ static PyObject *gdpy_dirfile_carrays(struct gdpy_dirfile_t *self,
} else if (!as_list) {
dims[0] = (npy_intp)carrays[i].n;
pydata = PyArray_SimpleNew(1, dims, gdpy_npytype_from_type(return_type));
- memcpy(PyArray_DATA(pydata), carrays[i].d, GD_SIZE(return_type) *
+ memcpy(PyArray_DATA((PyArrayObject*) pydata), carrays[i].d, GD_SIZE(return_type) *
carrays[i].n);
} else
pydata = gdpy_convert_to_pylist(carrays[i].d, return_type, carrays[i].n);
@@ -1003,7 +1003,7 @@ static PyObject *gdpy_dirfile_getdata(struct gdpy_dirfile_t *self,
if (!as_list) {
dims[0] = (npy_intp)num_samples;
pyobj = PyArray_SimpleNew(1, dims, gdpy_npytype_from_type(return_type));
- data = PyArray_DATA(pyobj);
+ data = PyArray_DATA((PyArrayObject*) pyobj);
} else
data = PyMem_Malloc((size_t)num_samples * GD_SIZE(return_type));
@@ -1537,7 +1537,7 @@ static PyObject *gdpy_dirfile_mcarrays(struct gdpy_dirfile_t *self,
} else if (!as_list) {
dims[0] = (npy_intp)carrays[i].n;
pydata = PyArray_SimpleNew(1, dims, gdpy_npytype_from_type(return_type));
- memcpy(PyArray_DATA(pydata), carrays[i].d, GD_SIZE(return_type) *
+ memcpy(PyArray_DATA((PyArrayObject*) pydata), carrays[i].d, GD_SIZE(return_type) *
carrays[i].n);
} else
pydata = gdpy_convert_to_pylist(carrays[i].d, return_type, carrays[i].n);
@@ -2310,7 +2310,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
/* we only handle list or ndarray data */
if (PyArray_Check(pyobj)) {
- if (PyArray_NDIM(pyobj) != 1) {
+ if (PyArray_NDIM((PyArrayObject*) pyobj) != 1) {
PyErr_SetString(PyExc_ValueError,
"pygetdata.dirfile.put_carray() argument 2 must be one dimensional");
PyMem_Free(field_code);
@@ -2318,7 +2318,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
return NULL;
}
have_ndarray = 1;
- len = (size_t)PyArray_DIM(pyobj, 0);
+ len = (size_t)PyArray_DIM((PyArrayObject*) pyobj, 0);
} else {
if (!PyList_Check(pyobj)) {
PyErr_SetString(PyExc_TypeError,
@@ -2336,7 +2336,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
void *data;
if (have_ndarray) {
- type = gdpy_type_from_npytype(PyArray_TYPE(pyobj));
+ type = gdpy_type_from_npytype(PyArray_TYPE((PyArrayObject*) pyobj));
if (type == GD_UNKNOWN) {
PyErr_SetString(PyExc_ValueError,
@@ -2346,7 +2346,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
return NULL;
}
- if (!(PyArray_FLAGS(pyobj) & NPY_ALIGNED)) {
+ if (!(PyArray_FLAGS((PyArrayObject*) pyobj) & NPY_ARRAY_ALIGNED)) {
PyErr_SetString(PyExc_ValueError,
"pygetdata.dirfile.put_carray() argument 2 must be aligned.");
PyMem_Free(field_code);
@@ -2354,7 +2354,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
return NULL;
}
- if (!(PyArray_FLAGS(pyobj) & NPY_C_CONTIGUOUS)) {
+ if (!(PyArray_FLAGS((PyArrayObject*) pyobj) & NPY_ARRAY_C_CONTIGUOUS)) {
PyErr_SetString(PyExc_ValueError, "pygetdata.dirfile.put_carray()"
" argument 2 must be C-style contiguous.");
PyMem_Free(field_code);
@@ -2362,7 +2362,7 @@ static PyObject *gdpy_dirfile_putcarray(struct gdpy_dirfile_t *self,
return NULL;
}
- data = PyArray_DATA(pyobj);
+ data = PyArray_DATA((PyArrayObject*) pyobj);
} else {
data = PyMem_Malloc(len * 16);
type = gdpy_convert_from_pylist(pyobj, data, type, len);
@@ -2477,7 +2477,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
/* we only handle list or ndarray data */
if (PyArray_Check(pyobj)) {
- if (PyArray_NDIM(pyobj) != 1) {
+ if (PyArray_NDIM((PyArrayObject*) pyobj) != 1) {
PyErr_SetString(PyExc_ValueError,
"pygetdata.dirfile.putdata() argument 2 must be one dimensional");
PyMem_Free(field_code);
@@ -2485,7 +2485,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
return NULL;
}
have_ndarray = 1;
- ns = PyArray_DIM(pyobj, 0);
+ ns = PyArray_DIM((PyArrayObject*) pyobj, 0);
} else {
if (!PyList_Check(pyobj)) {
PyErr_SetString(PyExc_TypeError,
@@ -2503,7 +2503,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
void *data;
if (have_ndarray) {
- type = gdpy_type_from_npytype(PyArray_TYPE(pyobj));
+ type = gdpy_type_from_npytype(PyArray_TYPE((PyArrayObject*) pyobj));
if (type == GD_UNKNOWN) {
PyErr_SetString(PyExc_ValueError,
@@ -2513,7 +2513,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
return NULL;
}
- if (!(PyArray_FLAGS(pyobj) & NPY_ALIGNED)) {
+ if (!(PyArray_FLAGS((PyArrayObject*) pyobj) & NPY_ARRAY_ALIGNED)) {
PyErr_SetString(PyExc_ValueError,
"pygetdata.dirfile.putdata() argument 2 must be aligned.");
PyMem_Free(field_code);
@@ -2521,7 +2521,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
return NULL;
}
- if (!(PyArray_FLAGS(pyobj) & NPY_C_CONTIGUOUS)) {
+ if (!(PyArray_FLAGS((PyArrayObject*) pyobj) & NPY_ARRAY_C_CONTIGUOUS)) {
PyErr_SetString(PyExc_ValueError, "pygetdata.dirfile.putdata()"
" argument 2 must be C-style contiguous.");
PyMem_Free(field_code);
@@ -2529,7 +2529,7 @@ static PyObject *gdpy_dirfile_putdata(struct gdpy_dirfile_t *self,
return NULL;
}
- data = PyArray_DATA(pyobj);
+ data = PyArray_DATA((PyArrayObject*) pyobj);
} else {
data = PyMem_Malloc(ns * 16);
type = gdpy_convert_from_pylist(pyobj, data, type, ns);
diff --git a/bindings/python/pygetdata.c b/bindings/python/pygetdata.c
index 50c948d..0e3bf3c 100644
--- a/bindings/python/pygetdata.c
+++ b/bindings/python/pygetdata.c
@@ -600,40 +600,40 @@ int gdpy_npytype_from_type(gd_type_t type)
switch(type)
{
case GD_UINT8:
- npytype = PyArray_UINT8;
+ npytype = NPY_UINT8;
break;
case GD_INT8:
- npytype = PyArray_INT8;
+ npytype = NPY_INT8;
break;
case GD_UINT16:
- npytype = PyArray_UINT16;
+ npytype = NPY_UINT16;
break;
case GD_INT16:
- npytype = PyArray_INT16;
+ npytype = NPY_INT16;
break;
case GD_UINT32:
- npytype = PyArray_UINT32;
+ npytype = NPY_UINT32;
break;
case GD_INT32:
- npytype = PyArray_INT32;
+ npytype = NPY_INT32;
break;
case GD_UINT64:
- npytype = PyArray_UINT64;
+ npytype = NPY_UINT64;
break;
case GD_INT64:
- npytype = PyArray_INT64;
+ npytype = NPY_INT64;
break;
case GD_FLOAT32:
- npytype = PyArray_FLOAT32;
+ npytype = NPY_FLOAT32;
break;
case GD_FLOAT64:
- npytype = PyArray_FLOAT64;
+ npytype = NPY_FLOAT64;
break;
case GD_COMPLEX64:
- npytype = PyArray_COMPLEX64;
+ npytype = NPY_COMPLEX64;
break;
case GD_COMPLEX128:
- npytype = PyArray_COMPLEX128;
+ npytype = NPY_COMPLEX128;
break;
default:
npytype = NPY_NOTYPE;
|
