Pull request #5: Migrate PyArray(Map|Neighborhood|Multi)_Type and PyArrayFlags_Type to HPy

Merge hpy-convert-iter to labs-hpy-port

* commit '00f4a563fd73d4aab3fd5fd0cd65320d9c844e3e':
  Remove _PyArrayMapIter_Type_p, make PyArrayMapIter_Type a pointer and define storage for it in mapping.c
  Convert PyArrayFlags to pure HPy type
  Convert PyArrayMultiIter_Type to legacy HPy type
  Convert PyArrayNeighborhoodIter_Type to legacy HPy type
  Convert PyArrayMapIter_Type to legacy HPy type
  Convert PyArrayIter_Type to legacy HPy type

Author: steve-s

numpy/core/code_generators/generate_numpy_api.py

@@ -15,8 +15,8 @@
         npy_bool obval;
 } PyBoolScalarObject;
 
-extern NPY_NO_EXPORT PyTypeObject PyArrayMapIter_Type;
-extern NPY_NO_EXPORT PyTypeObject PyArrayNeighborhoodIter_Type;
+extern NPY_NO_EXPORT PyTypeObject *PyArrayMapIter_Type;
+extern NPY_NO_EXPORT PyTypeObject *PyArrayNeighborhoodIter_Type;
 extern NPY_NO_EXPORT PyBoolScalarObject _PyArrayScalar_BoolValues[2];
 
 %s

numpy/core/code_generators/numpy_api.py

@@ -35,9 +35,9 @@
     # the following also defines PyArrayDescr_TypeFull (Full appended)
     #'PyArrayDescr_Type':                (3, "PyArray_DTypeMeta"),
     'PyArrayDescr_Type':                (3, None, "&PyArrayDescr_Type"),
-    'PyArrayFlags_Type':                (4,),
-    'PyArrayIter_Type':                 (5,),
-    'PyArrayMultiIter_Type':            (6,),
+    'PyArrayFlags_Type':                (4, None, "_PyArrayFlags_Type_p"),
+    'PyArrayIter_Type':                 (5, None, "_PyArrayIter_Type_p"),
+    'PyArrayMultiIter_Type':            (6, None, "_PyArrayMultiIter_Type_p"),
     'PyBoolArrType_Type':               (8,),
     'PyGenericArrType_Type':            (10,),
     'PyNumberArrType_Type':             (11,),

numpy/core/include/numpy/ndarraytypes.h

@@ -797,10 +797,12 @@ HPyArray_AsFields(HPyContext *ctx, HPy h)
 /* Array Flags Object */
 typedef struct PyArrayFlagsObject {
         PyObject_HEAD
-        PyObject *arr;
+        HPyField arr;
         int flags;
 } PyArrayFlagsObject;
 
+HPyType_HELPERS(PyArrayFlagsObject);
+
 /* Mirrors buffer object to ptr */
 
 typedef struct {

numpy/core/src/multiarray/arrayobject.h

@@ -28,5 +28,6 @@ array_might_be_written(PyArrayObject *obj);
 static const int NPY_ARRAY_WARN_ON_WRITE = (1 << 31);
 
 extern NPY_NO_EXPORT HPyType_Spec PyArray_Type_spec;
+extern NPY_NO_EXPORT HPyType_Spec PyArrayFlags_Type_Spec;
 
 #endif  /* NUMPY_CORE_SRC_MULTIARRAY_ARRAYOBJECT_H_ */