Skip to content

Commit 15a344d

Browse files
ENH: Implement opaque PyObject ABI support (#31091)
1 parent c895776 commit 15a344d

18 files changed

Lines changed: 1090 additions & 459 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Support for free-threaded stable ABI
2+
------------------------------------
3+
NumPy now supports the stable ABI for free-threaded Python as described in
4+
:pep:`803`.

‎numpy/__init__.cython-30.pxd‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,10 @@ cdef extern from "numpy/ndarraytypes.h":
836836
ctypedef int (*NpyIter_IterNextFunc "NpyIter_IterNextFunc *")(NpyIter* it) noexcept nogil
837837
ctypedef void (*NpyIter_GetMultiIndexFunc "NpyIter_GetMultiIndexFunc *")(NpyIter* it, npy_intp* outcoords) noexcept nogil
838838

839+
PyArray_DatetimeMetaData _PyDatetimeScalarObject_GetMetadata(object) noexcept nogil
840+
PyArray_DatetimeMetaData _PyTimedeltaScalarObject_GetMetadata(object) noexcept nogil
841+
npy_datetime _PyDatetimeScalarObject_GetValue(object) noexcept nogil
842+
npy_timedelta _PyTimedeltaScalarObject_GetValue(object) noexcept nogil
839843

840844
cdef extern from "numpy/arrayscalars.h":
841845

@@ -1126,21 +1130,21 @@ cdef inline npy_datetime get_datetime64_value(object obj) noexcept nogil:
11261130
Note that to interpret this as a datetime, the corresponding unit is
11271131
also needed. That can be found using `get_datetime64_unit`.
11281132
"""
1129-
return (<PyDatetimeScalarObject*>obj).obval
1133+
return _PyDatetimeScalarObject_GetValue(obj)
11301134

11311135

11321136
cdef inline npy_timedelta get_timedelta64_value(object obj) noexcept nogil:
11331137
"""
11341138
returns the int64 value underlying scalar numpy timedelta64 object
11351139
"""
1136-
return (<PyTimedeltaScalarObject*>obj).obval
1140+
return _PyTimedeltaScalarObject_GetValue(obj)
11371141

11381142

11391143
cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) noexcept nogil:
11401144
"""
11411145
returns the unit part of the dtype for a numpy datetime64 object.
11421146
"""
1143-
return <NPY_DATETIMEUNIT>(<PyDatetimeScalarObject*>obj).obmeta.base
1147+
return _PyDatetimeScalarObject_GetMetadata(obj).base
11441148

11451149

11461150
cdef extern from "numpy/arrayobject.h":

‎numpy/_core/code_generators/cversions.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,6 @@
8383
# Version 21 (NumPy 2.4.0)
8484
# Add 'same_value' casting, header additions.
8585
# General loop registration for ufuncs, sort, and argsort
86-
# Version 21 (NumPy 2.5.0) No change
8786
0x00000015 = fbd24fc5b2ba4f7cd3606ec6128de7a5
87+
# Version 22 (NumPy 2.5.0) Opaque PyObject ABI support
88+
0x00000016 = cdfba10e4e01454262d2293c394cbed5

‎numpy/_core/code_generators/numpy_api.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,16 @@ def get_annotations():
409409
# End 2.0 API
410410
# NpyIterGetTransferFlags (slot 223) added.
411411
# End 2.3 API
412+
'_PyArray_GET_ITEM_DATA': (369, MinVersion("2.5")),
413+
'_PyArrayIter_GET_ITEM_DATA': (370, MinVersion("2.5")),
414+
'_PyArray_LegacyDescr_GET_ITEM_DATA': (371, MinVersion("2.5")),
415+
'_PyDataType_GET_ITEM_DATA': (372, MinVersion("2.5")),
416+
'_PyArrayMultiIter_GET_ITEM_DATA': (373, MinVersion("2.5")),
417+
'_PyArrayNeighborhoodIter_GET_ITEM_DATA': (374, MinVersion("2.5")),
418+
'_PyDatetimeScalarObject_GetMetadata': (375,),
419+
'_PyTimedeltaScalarObject_GetMetadata': (376,),
420+
'_PyDatetimeScalarObject_GetValue': (377,),
421+
'_PyTimedeltaScalarObject_GetValue': (378,),
412422
}
413423

414424
ufunc_types_api = {
@@ -470,6 +480,7 @@ def get_annotations():
470480
'PyUFunc_GiveFloatingpointErrors': (46, MinVersion("2.0")),
471481
# End 2.0 API
472482
'PyUFunc_AddLoopsFromSpecs': (47, MinVersion("2.4")),
483+
'_PyUFuncObject_GET_ITEM_DATA': (48, MinVersion("2.5")),
473484
}
474485

475486
# List of all the dicts which define the C API

‎numpy/_core/include/numpy/_neighborhood_iterator_imp.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ _PyArrayNeighborhoodIter_IncrCoord(PyArrayNeighborhoodIterObject* iter);
2525
* ....
2626
*/
2727
#define _UPDATE_COORD_ITER(c) \
28-
wb = iter->coordinates[c] < iter->bounds[c][1]; \
28+
wb = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates[c] < _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->bounds[c][1]; \
2929
if (wb) { \
30-
iter->coordinates[c] += 1; \
30+
_PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates[c] += 1; \
3131
return 0; \
3232
} \
3333
else { \
34-
iter->coordinates[c] = iter->bounds[c][0]; \
34+
_PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates[c] = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->bounds[c][0]; \
3535
}
3636

3737
static inline int
3838
_PyArrayNeighborhoodIter_IncrCoord(PyArrayNeighborhoodIterObject* iter)
3939
{
4040
npy_intp i, wb;
4141

42-
for (i = iter->nd - 1; i >= 0; --i) {
42+
for (i = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->nd - 1; i >= 0; --i) {
4343
_UPDATE_COORD_ITER(i)
4444
}
4545

@@ -68,7 +68,7 @@ static inline int
6868
PyArrayNeighborhoodIter_Next(PyArrayNeighborhoodIterObject* iter)
6969
{
7070
_PyArrayNeighborhoodIter_IncrCoord (iter);
71-
iter->dataptr = iter->translate((PyArrayIterObject*)iter, iter->coordinates);
71+
_PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->dataptr = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->translate((PyArrayIterObject*)iter, _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates);
7272

7373
return 0;
7474
}
@@ -81,10 +81,10 @@ PyArrayNeighborhoodIter_Reset(PyArrayNeighborhoodIterObject* iter)
8181
{
8282
npy_intp i;
8383

84-
for (i = 0; i < iter->nd; ++i) {
85-
iter->coordinates[i] = iter->bounds[i][0];
84+
for (i = 0; i < _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->nd; ++i) {
85+
_PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates[i] = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->bounds[i][0];
8686
}
87-
iter->dataptr = iter->translate((PyArrayIterObject*)iter, iter->coordinates);
87+
_PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->dataptr = _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->translate((PyArrayIterObject*)iter, _PyArrayNeighborhoodIter_GET_ITEM_DATA(iter)->coordinates);
8888

8989
return 0;
9090
}

‎numpy/_core/include/numpy/arrayscalars.h‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef NUMPY_CORE_INCLUDE_NUMPY_ARRAYSCALARS_H_
22
#define NUMPY_CORE_INCLUDE_NUMPY_ARRAYSCALARS_H_
33

4+
#ifndef Py_TARGET_ABI3T
45
#ifndef _MULTIARRAYMODULE
56
typedef struct {
67
PyObject_HEAD
@@ -134,7 +135,7 @@ typedef struct {
134135
char obval;
135136
} PyScalarObject;
136137

137-
#define PyStringScalarObject PyBytesObject
138+
138139
#ifndef Py_LIMITED_API
139140
typedef struct {
140141
/* note that the PyObject_HEAD macro lives right here */
@@ -162,6 +163,34 @@ typedef struct {
162163
void *_buffer_info; /* private buffer info, tagged to allow warning */
163164
#endif
164165
} PyVoidScalarObject;
166+
#else
167+
typedef struct PyBoolScalarObject PyBoolScalarObject;
168+
typedef struct PyByteScalarObject PyByteScalarObject;
169+
typedef struct PyShortScalarObject PyShortScalarObject;
170+
typedef struct PyIntScalarObject PyIntScalarObject;
171+
typedef struct PyLongScalarObject PyLongScalarObject;
172+
typedef struct PyLongLongScalarObject PyLongLongScalarObject;
173+
typedef struct PyUByteScalarObject PyUByteScalarObject;
174+
typedef struct PyUShortScalarObject PyUShortScalarObject;
175+
typedef struct PyUIntScalarObject PyUIntScalarObject;
176+
typedef struct PyULongScalarObject PyULongScalarObject;
177+
typedef struct PyULongLongScalarObject PyULongLongScalarObject;
178+
typedef struct PyHalfScalarObject PyHalfScalarObject;
179+
typedef struct PyFloatScalarObject PyFloatScalarObject;
180+
typedef struct PyDoubleScalarObject PyDoubleScalarObject;
181+
typedef struct PyLongDoubleScalarObject PyLongDoubleScalarObject;
182+
typedef struct PyCFloatScalarObject PyCFloatScalarObject;
183+
typedef struct PyCDoubleScalarObject PyCDoubleScalarObject;
184+
typedef struct PyCLongDoubleScalarObject PyCLongDoubleScalarObject;
185+
typedef struct PyObjectScalarObject PyObjectScalarObject;
186+
typedef struct PyDatetimeScalarObject PyDatetimeScalarObject;
187+
typedef struct PyTimedeltaScalarObject PyTimedeltaScalarObject;
188+
typedef struct PyScalarObject PyScalarObject;
189+
typedef struct PyVoidScalarObject PyVoidScalarObject;
190+
#endif
191+
192+
193+
165194

166195
/* Macros
167196
Py<Cls><bitsize>ScalarObject
@@ -193,6 +222,7 @@ typedef struct {
193222
((Py##cls##ScalarObject *)obj)->obval
194223
#define PyArrayScalar_ASSIGN(obj, cls, val) \
195224
PyArrayScalar_VAL(obj, cls) = val
225+
#define PyStringScalarObject PyBytesObject
196226
#endif
197227

198228
#endif /* NUMPY_CORE_INCLUDE_NUMPY_ARRAYSCALARS_H_ */

‎numpy/_core/include/numpy/ndarrayobject.h‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,7 @@ extern "C" {
1010

1111
#include <Python.h>
1212
#include "ndarraytypes.h"
13-
#include "dtype_api.h"
1413

15-
/* Includes the "function" C-API -- these are all stored in a
16-
list of pointers --- one for each file
17-
The two lists are concatenated into one in multiarray.
18-
19-
They are available as import_array()
20-
*/
21-
22-
#include "__multiarray_api.h"
2314

2415
/*
2516
* Include any definitions which are defined differently for 1.x and 2.x
@@ -156,7 +147,7 @@ extern "C" {
156147
static inline void
157148
PyArray_DiscardWritebackIfCopy(PyArrayObject *arr)
158149
{
159-
PyArrayObject_fields *fa = (PyArrayObject_fields *)arr;
150+
PyArrayObject_fields *fa = _PyArray_GET_ITEM_DATA(arr);
160151
if (fa && fa->base) {
161152
if (fa->flags & NPY_ARRAY_WRITEBACKIFCOPY) {
162153
PyArray_ENABLEFLAGS((PyArrayObject*)fa->base, NPY_ARRAY_WRITEABLE);

0 commit comments

Comments
 (0)