Pull request #9: Add some HPy helpers

Merge ss/add-hpy-helpers to labs-hpy-port

* commit '68e7a70c10eb0751424df3ce1fb43cf385e62d95':
  Cleanup some compiler warnings
  Change HPy helpers names in ndarraytypes.h to follow conventions
  Add hpy_abort_not_implemented helper function
  Add HPY helpers for array/dtype types

Author: steve-s

numpy/core/include/numpy/ndarrayobject.h

@@ -28,6 +28,8 @@ extern "C" {
 
 #define PyArray_Check(op) PyObject_TypeCheck(op, &PyArray_Type)
 #define PyArray_CheckExact(op) (((PyObject*)(op))->ob_type == &PyArray_Type)
+#define HPyArray_Check(ctx, op) HPy_TypeCheck(ctx, op, HPyArray_Type)
+#define HPyArray_CheckExact(ctx, op) HPy_Is(ctx, op, HPyArray_Type)
 
 #define PyArray_HasArrayInterfaceType(op, type, context, out)                 \
         ((((out)=PyArray_FromStructInterface(op)) != Py_NotImplemented) ||    \

numpy/core/include/numpy/ndarraytypes.h

@@ -24,6 +24,11 @@ static NPY_INLINE
 void capi_warn(const char *where) {
         printf("DEBUG WARNING: leaving to CPython API in %s\n", where);
 }
+static __attribute__ ((noreturn)) NPY_INLINE
+void hpy_abort_not_implemented(const char *where) {
+        printf("FATAL ERROR: not implemented in HPY: %s\n", where);
+        abort();
+}
 
 #ifdef __cplusplus
 }
@@ -673,6 +678,8 @@ typedef struct _PyArray_Descr {
         npy_hash_t hash;
 } PyArray_Descr;
 
+HPyType_LEGACY_HELPERS(PyArray_Descr)
+
 typedef struct _arr_descr {
         PyArray_Descr *base;
         PyObject *shape;       /* a tuple */
@@ -775,10 +782,12 @@ typedef struct tagPyArrayObject {
 } PyArrayObject;
 #endif
 
+HPyType_LEGACY_HELPERS(PyArrayObject)
+
 static NPY_INLINE PyArrayObject_fields *
 HPyArray_AsFields(HPyContext *ctx, HPy h)
 {
-    return (PyArrayObject_fields*)HPy_AsStructLegacy(ctx, h);
+    return (PyArrayObject_fields*)PyArrayObject_AsStruct(ctx, h);
 }
 
 /*
@@ -1552,6 +1561,12 @@ HPyArray_GetDescr(HPyContext *ctx, HPy arr)
     return HPyField_Load(ctx, arr, HPyArray_AsFields(ctx, arr)->f_descr);
 }
 
+static NPY_INLINE HPy
+HPyArray_DESCR(HPyContext *ctx, HPy arr, const PyArrayObject *arr_data)
+{
+    return HPyField_Load(ctx, arr, ((PyArrayObject_fields *)arr_data)->f_descr);
+}
+
 static NPY_INLINE NPY_RETURNS_BORROWED_REF PyArray_Descr *
 PyArray_DESCR(const PyArrayObject *arr)
 {
@@ -1635,6 +1650,12 @@ PyArray_NDIM(const PyArrayObject *arr)
     return ((PyArrayObject_fields *)arr)->nd;
 }
 
+static NPY_INLINE int
+HPyArray_GetNDim(HPyContext *ctx, HPy arr)
+{
+    return ((PyArrayObject_fields *) HPy_AsStructLegacy(ctx, arr))->nd;
+}
+
 static NPY_INLINE void *
 PyArray_DATA(PyArrayObject *arr)
 {
@@ -1647,6 +1668,12 @@ PyArray_BYTES(PyArrayObject *arr)
     return ((PyArrayObject_fields *)arr)->data;
 }
 
+static NPY_INLINE char *
+HPyArray_GetBytes(HPyContext *ctx, HPy h_arr)
+{
+    return HPyArray_AsFields(ctx, h_arr)->data;
+}
+
 static NPY_INLINE npy_intp *
 PyArray_DIMS(PyArrayObject *arr)
 {
@@ -1684,6 +1711,24 @@ PyArray_ITEMSIZE(const PyArrayObject *arr)
     return PyArray_DESCR(arr)->elsize;
 }
 
+static NPY_INLINE npy_intp
+HPyArray_ITEMSIZE(HPyContext *ctx, HPy arr, const PyArrayObject *arr_data)
+{
+    HPy descr = HPyArray_DESCR(ctx, arr, arr_data);
+    npy_intp res = PyArray_Descr_AsStruct(ctx, descr)->elsize;
+    HPy_Close(ctx, descr);
+    return res;
+}
+
+static NPY_INLINE npy_intp
+HPyArray_GetItemsize(HPyContext *ctx, HPy arr)
+{
+    HPy descr = HPyArray_GetDescr(ctx, arr);
+    npy_intp res = PyArray_Descr_AsStruct(ctx, descr)->elsize;
+    HPy_Close(ctx, descr);
+    return res;
+}
+
 static NPY_INLINE int
 PyArray_TYPE(const PyArrayObject *arr)
 {
@@ -1720,6 +1765,12 @@ PyArray_DTYPE(PyArrayObject *arr)
     return PyArray_DESCR(arr);
 }
 
+static NPY_INLINE HPy
+HPyArray_DTYPE(HPyContext *ctx, HPy arr)
+{
+    return HPyArray_GetDescr(ctx, arr);
+}
+
 static NPY_INLINE npy_intp *
 PyArray_SHAPE(PyArrayObject *arr)
 {

numpy/core/src/multiarray/arrayobject.h

@@ -28,6 +28,7 @@ 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 HPy HPyArray_Type;
 extern NPY_NO_EXPORT HPyType_Spec PyArrayFlags_Type_Spec;
 
 #endif  /* NUMPY_CORE_SRC_MULTIARRAY_ARRAYOBJECT_H_ */

numpy/core/src/multiarray/conversion_utils.c

@@ -1169,7 +1169,7 @@ HPyArray_IntpFromIndexSequence(HPyContext *ctx, HPy seq, npy_intp *vals, npy_int
 {
     HPy_ssize_t nd;
     npy_intp i;
-    HPy op, err;
+    HPy op;
 
     /*
      * Check to see if sequence is a single integer first.

numpy/core/src/multiarray/multiarraymodule.c

@@ -111,6 +111,7 @@ set_legacy_print_mode(PyObject *NPY_UNUSED(self), PyObject *args)
 
 NPY_NO_EXPORT PyTypeObject* _PyArray_Type_p = NULL;
 NPY_NO_EXPORT HPyContext *numpy_global_ctx = NULL;
+NPY_NO_EXPORT HPy HPyArray_Type;
 NPY_NO_EXPORT HPy HPyArrayDescr_Type;
 
 /* Only here for API compatibility */
@@ -4870,6 +4871,7 @@ static HPy init__multiarray_umath_impl(HPyContext *ctx) {
         goto err;
     }
     _PyArray_Type_p = (PyTypeObject*)HPy_AsPyObject(ctx, h_array_type);
+    HPyArray_Type = HPy_Dup(ctx, h_array_type);
     PyArray_Type.tp_weaklistoffset = offsetof(PyArrayObject_fields, weakreflist);
     HPy_Close(ctx, h_array_type);
 

numpy/core/src/multiarray/scalartypes.c.src

@@ -3531,21 +3531,6 @@ object_arrtype_inplace_repeat(PyObjectScalarObject *self, Py_ssize_t count)
     return PySequence_InPlaceRepeat(self->obval, count);
 }
 
-static PySequenceMethods object_arrtype_as_sequence = {
-    .sq_length = (lenfunc)object_arrtype_length,
-    .sq_concat = (binaryfunc)object_arrtype_concat,
-    .sq_repeat = (ssizeargfunc)object_arrtype_repeat,
-    .sq_contains = (objobjproc)object_arrtype_contains,
-    .sq_inplace_concat = (binaryfunc)object_arrtype_inplace_concat,
-    .sq_inplace_repeat = (ssizeargfunc)object_arrtype_inplace_repeat,
-};
-
-static PyMappingMethods object_arrtype_as_mapping = {
-    .mp_length = (lenfunc)object_arrtype_length,
-    .mp_subscript = (binaryfunc)object_arrtype_subscript,
-    .mp_ass_subscript = (objobjargproc)object_arrtype_ass_subscript,
-};
-
 static int
 object_arrtype_getbuffer(PyObjectScalarObject *self, Py_buffer *view, int flags)
 {