MAINT: Use direct subarray access to avoid warnings

seberg · seberg · commit ae8cd992c803 · 2024-03-05T15:04:57.000+01:00
diff --git a/numpy/_core/src/multiarray/arraytypes.c.src b/numpy/_core/src/multiarray/arraytypes.c.src
@@ -1125,7 +1125,7 @@ VOID_setitem(PyObject *op, void *input, void *vap)
         }
         return 0;
     }
-    else if (PyDataType_HASSUBARRAY(descr)) {
+    else if (descr->subarray != NULL) {
         /* copy into an array of the same basic type */
         PyArray_Dims shape = {NULL, -1};
         if (!(PyArray_IntpConverter(descr->subarray->shape, &shape))) {
@@ -2297,7 +2297,7 @@ VOID_copyswapn (char *dst, npy_intp dstride, char *src, npy_intp sstride,
         }
         return;
     }
-    if (PyDataType_HASSUBARRAY(descr)) {
+    if (descr->subarray) {
         PyArray_Descr *new;
         npy_intp num;
         npy_intp i;
@@ -2382,7 +2382,7 @@ VOID_copyswap (char *dst, char *src, int swap, PyArrayObject *arr)
         }
         return;
     }
-    if (PyDataType_HASSUBARRAY(descr)) {
+    if (descr->subarray != NULL) {
         PyArray_Descr *new;
         npy_intp num;
         int subitemsize;
diff --git a/numpy/_core/src/multiarray/descriptor.c b/numpy/_core/src/multiarray/descriptor.c
@@ -3043,7 +3043,7 @@ arraydescr_setstate(_PyArray_LegacyDescr *self, PyObject *args)
         }
 
         self->subarray = PyArray_malloc(sizeof(PyArray_ArrayDescr));
-        if (!PyDataType_HASSUBARRAY(self)) {
+        if (self->subarray == NULL) {
             return PyErr_NoMemory();
         }
         self->subarray->base = (PyArray_Descr *)PyTuple_GET_ITEM(subarray, 0);
@@ -3341,7 +3341,7 @@ PyArray_DescrNewByteorder(PyArray_Descr *oself, char newendian)
         Py_DECREF(new->fields);
         new->fields = newfields;
     }
-    if (PyDataType_HASSUBARRAY(new)) {
+    if (new->subarray) {
         Py_DECREF(new->subarray->base);
         new->subarray->base = PyArray_DescrNewByteorder(
                 self->subarray->base, newendian);
diff --git a/numpy/_core/src/multiarray/dtype_traversal.c b/numpy/_core/src/multiarray/dtype_traversal.c
@@ -516,7 +516,7 @@ npy_get_clear_void_and_legacy_user_dtype_loop(
         return 0;
     }
 
-    if (PyDataType_HASSUBARRAY(dtype)) {
+    if (dtype->subarray != NULL) {
         PyArray_Dims shape = {NULL, -1};
         npy_intp size;
 
@@ -602,7 +602,7 @@ npy_get_zerofill_void_and_legacy_user_dtype_loop(
         npy_intp stride, PyArrayMethod_TraverseLoop **out_func,
         NpyAuxData **out_auxdata, NPY_ARRAYMETHOD_FLAGS *flags)
 {
-    if (PyDataType_HASSUBARRAY(dtype)) {
+    if (dtype->subarray != NULL) {
         PyArray_Dims shape = {NULL, -1};
         npy_intp size;
 
diff --git a/numpy/_core/src/multiarray/hashdescr.c b/numpy/_core/src/multiarray/hashdescr.c
@@ -244,7 +244,7 @@ static int _array_descr_walk(PyArray_Descr* descr, PyObject *l)
                 return -1;
             }
         }
-        if(PyDataType_HASSUBARRAY(ldescr)) {
+        if(ldescr->subarray != NULL) {
             st = _array_descr_walk_subarray(ldescr->subarray, l);
             if (st) {
                 return -1;

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ VOID_setitem(PyObject op, void input, void *vap)`
`1125`	`1125`	`}`
`1126`	`1126`	`return 0;`
`1127`	`1127`	`}`
`1128`		`- else if (PyDataType_HASSUBARRAY(descr)) {`
	`1128`	`+ else if (descr->subarray != NULL) {`
`1129`	`1129`	`/* copy into an array of the same basic type */`
`1130`	`1130`	`PyArray_Dims shape = {NULL, -1};`
`1131`	`1131`	`if (!(PyArray_IntpConverter(descr->subarray->shape, &shape))) {`
`@@ -2297,7 +2297,7 @@ VOID_copyswapn (char dst, npy_intp dstride, char src, npy_intp sstride,`
`2297`	`2297`	`}`
`2298`	`2298`	`return;`
`2299`	`2299`	`}`
`2300`		`- if (PyDataType_HASSUBARRAY(descr)) {`
	`2300`	`+ if (descr->subarray) {`
`2301`	`2301`	`PyArray_Descr *new;`
`2302`	`2302`	`npy_intp num;`
`2303`	`2303`	`npy_intp i;`
`@@ -2382,7 +2382,7 @@ VOID_copyswap (char dst, char src, int swap, PyArrayObject *arr)`
`2382`	`2382`	`}`
`2383`	`2383`	`return;`
`2384`	`2384`	`}`
`2385`		`- if (PyDataType_HASSUBARRAY(descr)) {`
	`2385`	`+ if (descr->subarray != NULL) {`
`2386`	`2386`	`PyArray_Descr *new;`
`2387`	`2387`	`npy_intp num;`
`2388`	`2388`	`int subitemsize;`
Original file line number	Diff line number	Diff line change
`@@ -3043,7 +3043,7 @@ arraydescr_setstate(_PyArray_LegacyDescr self, PyObject args)`
`3043`	`3043`	`}`
`3044`	`3044`
`3045`	`3045`	`self->subarray = PyArray_malloc(sizeof(PyArray_ArrayDescr));`
`3046`		`- if (!PyDataType_HASSUBARRAY(self)) {`
	`3046`	`+ if (self->subarray == NULL) {`
`3047`	`3047`	`return PyErr_NoMemory();`
`3048`	`3048`	`}`
`3049`	`3049`	`self->subarray->base = (PyArray_Descr *)PyTuple_GET_ITEM(subarray, 0);`
`@@ -3341,7 +3341,7 @@ PyArray_DescrNewByteorder(PyArray_Descr *oself, char newendian)`
`3341`	`3341`	`Py_DECREF(new->fields);`
`3342`	`3342`	`new->fields = newfields;`
`3343`	`3343`	`}`
`3344`		`- if (PyDataType_HASSUBARRAY(new)) {`
	`3344`	`+ if (new->subarray) {`
`3345`	`3345`	`Py_DECREF(new->subarray->base);`
`3346`	`3346`	`new->subarray->base = PyArray_DescrNewByteorder(`
`3347`	`3347`	`self->subarray->base, newendian);`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ npy_get_clear_void_and_legacy_user_dtype_loop(`
`516`	`516`	`return 0;`
`517`	`517`	`}`
`518`	`518`
`519`		`- if (PyDataType_HASSUBARRAY(dtype)) {`
	`519`	`+ if (dtype->subarray != NULL) {`
`520`	`520`	`PyArray_Dims shape = {NULL, -1};`
`521`	`521`	`npy_intp size;`
`522`	`522`
`@@ -602,7 +602,7 @@ npy_get_zerofill_void_and_legacy_user_dtype_loop(`
`602`	`602`	`npy_intp stride, PyArrayMethod_TraverseLoop **out_func,`
`603`	`603`	`NpyAuxData *out_auxdata, NPY_ARRAYMETHOD_FLAGS flags)`
`604`	`604`	`{`
`605`		`- if (PyDataType_HASSUBARRAY(dtype)) {`
	`605`	`+ if (dtype->subarray != NULL) {`
`606`	`606`	`PyArray_Dims shape = {NULL, -1};`
`6 9040 07`	`607`	`npy_intp size;`
`608`	`608`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ static int _array_descr_walk(PyArray_Descr* descr, PyObject *l)`
`244`	`244`	`return -1;`
`245`	`245`	`}`
`246`	`246`	`}`
`247`		`- if(PyDataType_HASSUBARRAY(ldescr)) {`
	`247`	`+ if(ldescr->subarray != NULL) {`
`248`	`248`	`st = _array_descr_walk_subarray(ldescr->subarray, l);`
`249`	`249`	`if (st) {`
`250`	`250`	`return -1;`