Use HPy_Call in __HPyArray_GenericHelper and hpy_npy_ctypes_check

fangerer · fangerer · commit 868ee2237813 · 2023-03-23T12:00:54.000+01:00
diff --git a/numpy/core/src/common/npy_ctypes.h b/numpy/core/src/common/npy_ctypes.h
@@ -60,8 +60,7 @@ hpy_npy_ctypes_check(HPyContext *ctx, HPy /* PyTypeObject * */ obj)
         goto fail;
     }
 
-    HPy args = HPyTuple_Pack(ctx, 1, obj);
-    ret_obj = HPy_CallTupleDict(ctx, py_func, args, HPy_NULL); // PyObject_CallFunctionObjArgs
+    ret_obj = HPy_Call(ctx, py_func, &obj, 1, HPy_NULL); // PyObject_CallFunctionObjArgs
     if (HPy_IsNull(ret_obj)) {
         goto fail;
     }
diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c
@@ -316,13 +316,11 @@ PyArray_GenericBinaryFunction(PyObject *m1, PyObject *m2, PyObject *op)
     return PyObject_CallFunctionObjArgs(op, m1, m2, NULL);
 }
 
-static NPY_NO_EXPORT HPy
+static inline HPy
 __HPyArray_GenericHelper(HPyContext *ctx, HPyGlobal op, size_t n_args, HPy args[]) {
 
-    HPy args_tuple = HPyTuple_FromArray(ctx, args, n_args);
     HPy callable = HPyGlobal_Load(ctx, op);
-    HPy res = HPy_CallTupleDict(ctx, callable, args_tuple, HPy_NULL);
-    HPy_Close(ctx, args_tuple);
+    HPy res = HPy_Call(ctx, callable, args, n_args, HPy_NULL);
     HPy_Close(ctx, callable);
     return res;
 }

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ hpy_npy_ctypes_check(HPyContext ctx, HPy / PyTypeObject * */ obj)`
`60`	`60`	`goto fail;`
`61`	`61`	`}`
`62`	`62`
`63`		`- HPy args = HPyTuple_Pack(ctx, 1, obj);`
`64`		`- ret_obj = HPy_CallTupleDict(ctx, py_func, args, HPy_NULL); // PyObject_CallFunctionObjArgs`
	`63`	`+ ret_obj = HPy_Call(ctx, py_func, &obj, 1, HPy_NULL); // PyObject_CallFunctionObjArgs`
`65`	`64`	`if (HPy_IsNull(ret_obj)) {`
`66`	`65`	`goto fail;`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -316,13 +316,11 @@ PyArray_GenericBinaryFunction(PyObject m1, PyObject m2, PyObject *op)`
`316`	`316`	`return PyObject_CallFunctionObjArgs(op, m1, m2, NULL);`
`317`	`317`	`}`
`318`	`318`
`319`		`-static NPY_NO_EXPORT HPy`
	`319`	`+static inline HPy`
`320`	`320`	`__HPyArray_GenericHelper(HPyContext *ctx, HPyGlobal op, size_t n_args, HPy args[]) {`
`321`	`321`
`322`		`- HPy args_tuple = HPyTuple_FromArray(ctx, args, n_args);`
`323`	`322`	`HPy callable = HPyGlobal_Load(ctx, op);`
`324`		`- HPy res = HPy_CallTupleDict(ctx, callable, args_tuple, HPy_NULL);`
`325`		`- HPy_Close(ctx, args_tuple);`
	`323`	`+ HPy res = HPy_Call(ctx, callable, args, n_args, HPy_NULL);`
`326`	`324`	`HPy_Close(ctx, callable);`
`327`	`325`	`return res;`
`328`	`326`	`}`