8000 Migrate to new HPyFunc_VARARGS signature · mattip/numpy@fe390fe · GitHub
[go: up one dir, main page]
Skip to content
/ numpy Public
forked from numpy/numpy

Commit fe390fe

Browse files
fangererfangerer
committed
Migrate to new HPyFunc_VARARGS signature
1 parent 30c3d13 commit fe390fe

File tree

12 files changed

+27
-27
lines changed

12 files changed

+ 8000 27
-27
lines changed

‎numpy/core/src/common/hpy_utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ HPyGlobal_TypeCheck(HPyContext *ctx, HPy obj, HPyGlobal type)
103103
}
104104

105105
NPY_NO_EXPORT HPy
106-
HPyFastcallToDict(HPyContext *ctx, HPy *args, HPy_ssize_t nargs, HPy kwnames)
106+
HPyFastcallToDict(HPyContext *ctx, const HPy *args, size_t nargs, HPy kwnames)
107107
{
108108
HPy kw, kwname;
109109
HPy_ssize_t nkw, i;

‎numpy/core/src/common/hpy_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ HPyGlobal_TypeCheck(HPyContext *ctx, HPy obj, HPyGlobal type);
6666
* in a dict). It returns a the keywords dict.
6767
*/
6868
NPY_NO_EXPORT HPy
69-
HPyFastcallToDict(HPyContext *ctx, HPy *args, HPy_ssize_t nargs, HPy kwnames);
69+
HPyFastcallToDict(HPyContext *ctx, const HPy *args, size_t nargs, HPy kwnames);
7070

7171
static NPY_INLINE HPy *
7272
HPy_FromPyObjectArray(HPyContext *ctx, PyObject **arr, Py_ssize_t n)

‎numpy/core/src/multiarray/_multiarray_tests.c.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ fromstring_null_term_c_api(PyObject *dummy, PyObject *byte_obj)
660660
*/
661661
HPyDef_METH(create_custom_field_dtype, "create_custom_field_dtype", HPyFunc_VARARGS)
662662
static HPy
663-
create_custom_field_dtype_impl(HPyContext *ctx, HPy dummy, HPy *args, HPy_ssize_t nargs)
663+
create_custom_field_dtype_impl(HPyContext *ctx, HPy dummy, const HPy *args, size_t nargs)
664664
{
665665
PyArray_Descr *dtype;
666666
HPy h_dtype;

‎numpy/core/src/multiarray/arrayfunction_override.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ hpy_array_implement_array_function_internal(HPyContext *ctx,
636636
*/
637637
HPyDef_METH(implement_array_function, "implement_array_function", HPyFunc_VARARGS)
638638
static HPy
639-
implement_array_function_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
639+
implement_array_function_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
640640
{
641641
// if (!PyArg_UnpackTuple(
642642
// positional_args, "implement_array_function", 5, 5,
@@ -881,7 +881,7 @@ hpy_array_implement_c_array_function_creation(HPyContext *ctx,
881881
HPyDef_METH(_get_implementing_args, "_get_implementing_args", HPyFunc_VARARGS)
882882
NPY_NO_EXPORT HPy
883883
_get_implementing_args_impl(
884-
HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
884+
HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
885885
{
886886
HPy relevant_args;
887887
HPy implementing_args[NPY_MAXARGS];

‎numpy/core/src/multiarray/compiled_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ arr_unravel_index_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args
14981498

14991499
HPyDef_METH(hpy_add_docstring, "add_docstring", HPyFunc_VARARGS)
15001500
static HPy
1501-
hpy_add_docstring_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
1501+
hpy_add_docstring_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
15021502
{
15031503
// HPy PORT: we will ignore adding docs and behave as `Py_OptimizeFlag > 1` path
15041504
return HPy_Dup(ctx, ctx->h_None);

‎numpy/core/src/multiarray/convert_datatype.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ HPyArray_GetBoundCastingImpl(HPyContext *ctx,
239239

240240
HPyDef_METH(_get_castingimpl, "_get_castingimpl", HPyFunc_VARARGS)
241241
NPY_NO_EXPORT HPy
242-
_get_castingimpl_impl(HPyContext *ctx, HPy NPY_UNUSED(module), HPy *args, HPy_ssize_t nargs)
242+
_get_castingimpl_impl(HPyContext *ctx, HPy NPY_UNUSED(module), const HPy *args, size_t nargs)
243243
{
244244
HPy from, to; // PyArray_DTypeMeta *
245245
if (!HPyArg_Parse(ctx, NULL, args, nargs, "OO:_get_castingimpl",

‎numpy/core/src/multiarray/descriptor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ _hpy_arraydescr_try_convert_from_dtype_attr(HPyContext *ctx, HPy obj)
187187
*/
188188
HPyDef_METH(array_set_typeDict, "set_typeDict", HPyFunc_VARARGS)
189189
NPY_NO_EXPORT HPy
190-
array_set_typeDict_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_ssize_t nargs)
190+
array_set_typeDict_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args, size_t nargs)
191191
{
192192
HPy dict;
193193

@@ -2958,7 +2958,7 @@ _hpy_descr_find_object(HPyContext *ctx, HPy self, PyArray_Descr *self_struct)
29582958
*/
29592959
HPyDef_METH(arraydescr_setstate, "__setstate__", HPyFunc_VARARGS)
29602960
static HPy
2961-
arraydescr_setstate_impl(HPyContext *ctx, HPy /* PyArray_Descr * */ self, HPy *args, HPy_ssize_t nargs)
2961+
arraydescr_setstate_impl(HPyContext *ctx, HPy /* PyArray_Descr * */ self, const HPy *args, size_t nargs)
29622962
{
29632963
int elsize = -1, alignment = -1;
29642964
int version = 4;
@@ -3636,7 +3636,7 @@ HPyArray_DescrNewByteorder(HPyContext *ctx, HPy /* PyArray_Descr * */ self, char
36363636

36373637
HPyDef_METH(arraydescr_newbyteorder, "newbyteorder", HPyFunc_VARARGS)
36383638
static HPy
3639-
arraydescr_newbyteorder_impl(HPyContext *ctx, HPy /* PyArray_Descr * */ self, HPy *args, HPy_ssize_t nargs)
3639+
arraydescr_newbyteorder_impl(HPyContext *ctx, HPy /* PyArray_Descr * */ self, const HPy *args, size_t nargs)
36403640
{
36413641
char endian=NPY_SWAP;
36423642
HPy h_endian = HPy_NULL;

‎numpy/core/src/multiarray/methods.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,7 +2379,7 @@ array_sizeof(PyArrayObject *self, PyObject *NPY_UNUSED(args))
23792379

23802380
HPyDef_METH(array_transpose, "transpose", HPyFunc_VARARGS)
23812381
static HPy
2382-
array_transpose_impl(HPyContext *ctx, /*PyArrayObject*/ HPy h_self, HPy *args, HPy_ssize_t n)
2382+
array_transpose_impl(HPyContext *ctx, /*PyArrayObject*/ HPy h_self, const HPy *args, size_t n)
23832383
{
23842384
HPy shape = ctx->h_None;
23852385
PyArray_Dims permute;
@@ -2589,7 +2589,7 @@ array_compress_impl(HPyContext *ctx, HPy h_self, const HPy *args, size_t nargs,
25892589

25902590
HPyDef_METH(array_nonzero, "nonzero", HPyFunc_VARARGS)
25912591
static HPy
2592-
array_nonzero_impl(HPyContext *ctx, HPy h_self, HPy *args, HPy_ssize_t nargs)
2592+
array_nonzero_impl(HPyContext *ctx, HPy h_self, const HPy *args, size_t nargs)
25932593
{
25942594
if (!HPyArg_Parse(ctx, NULL, args, nargs, "")) {
25952595
return HPy_NULL;

‎numpy/core/src/multiarray/multiarraymodule.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int npy_legacy_print_mode = INT_MAX;
105105

106106
HPyDef_METH(set_legacy_print_mode, "set_legacy_print_mode", HPyFunc_VARARGS)
107107
static HPy
108-
set_legacy_print_mode_impl(HPyContext *ctx, HPy NPY_UNUSED(self), HPy *args, HPy_ssize_t nargs)
108+
set_legacy_print_mode_impl(HPyContext *ctx, HPy NPY_UNUSED(self), const HPy *args, size_t nargs)
109109
{
110110
if (!HPyArg_Parse(ctx, NULL, args, nargs, "i", &npy_legacy_print_mode)) {
111111
return HPy_NULL;
@@ -3704,7 +3704,7 @@ array_concatenate_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args
37043704

37053705
HPyDef_METH(array_innerproduct, "inner", HPyFunc_VARARGS)
37063706
static HPy
3707-
array_innerproduct_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_ssize_t nargs)
3707+
array_innerproduct_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args, size_t nargs)
37083708
{
37093709
HPy b0, a0;
37103710

@@ -3749,7 +3749,7 @@ array_matrixproduct_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *ar
37493749

37503750
HPyDef_METH(array_vdot, "vdot", HPyFunc_VARARGS)
37513751
static HPy
3752-
array_vdot_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_ssize_t nargs)
3752+
array_vdot_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args, size_t nargs)
37533753
{
37543754
int typenum;
37553755
char *ip1, *ip2, *op;
@@ -4256,7 +4256,7 @@ array_einsum_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_
42564256

42574257
HPyDef_METH(_fastCopyAndTranspose, "_fastCopyAndTranspose", HPyFunc_VARARGS)
42584258
static HPy
4259-
_fastCopyAndTranspose_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
4259+
_fastCopyAndTranspose_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
42604260
{
42614261
HPy a0;
42624262

@@ -4431,7 +4431,7 @@ PyArray_GetEndianness(void)
44314431

44324432
HPyDef_METH(_reconstruct, "_reconstruct", HPyFunc_VARARGS)
44334433
static HPy
4434-
_reconstruct_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
4434+
_reconstruct_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
44354435
{
44364436

44374437
HPy ret;
@@ -4752,7 +4752,7 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
47524752

47534753
HPyDef_METH(array_where, "where", HPyFunc_VARARGS)
47544754
static HPy
4755-
array_where_impl(HPyContext *ctx, HPy ignored, HPy *args, HPy_ssize_t nargs)
4755+
array_where_impl(HPyContext *ctx, HPy ignored, const HPy *args, size_t nargs)
47564756
{
47574757
HPy obj = HPy_NULL, x = HPy_NULL, y = HPy_NULL;
47584758

@@ -4856,7 +4856,7 @@ array_can_cast_safely_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *
48564856

48574857
HPyDef_METH(array_promote_types, "promote_types", HPyFunc_VARARGS)
48584858
static HPy
4859-
array_promote_types_impl(HPyContext *ctx, HPy dummy, HPy *args, HPy_ssize_t nargs)
4859+
array_promote_types_impl(HPyContext *ctx, HPy dummy, const HPy *args, size_t nargs)
48604860
{
48614861
HPy d1 = HPy_NULL, h_d1;
48624862
HPy d2 = HPy_NULL, h_d2;
@@ -4890,7 +4890,7 @@ array_promote_types_impl(HPyContext *ctx, HPy dummy, HPy *args, HPy_ssize_t narg
48904890

48914891
HPyDef_METH(array_min_scalar_type, "min_scalar_type", HPyFunc_VARARGS)
48924892
static HPy
4893-
array_min_scalar_type_impl(HPyContext *ctx, HPy dummy, HPy *args, HPy_ssize_t nargs)
4893+
array_min_scalar_type_impl(HPyContext *ctx, HPy dummy, const HPy *args, size_t nargs)
48944894
{
48954895
HPy array_in = HPy_NULL;
48964896
HPy array;
@@ -4912,7 +4912,7 @@ array_min_scalar_type_impl(HPyContext *ctx, HPy dummy, HPy *args, HPy_ssize_t na
49124912

49134913
HPyDef_METH(array_result_type, "result_type", HPyFunc_VARARGS)
49144914
static HPy
4915-
array_result_type_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_ssize_t nargs)
4915+
array_result_type_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args, size_t nargs)
49164916
{
49174917
npy_intp i, len, narr = 0, ndtypes = 0;
49184918
HPy *arr = NULL; // PyArrayObject **
@@ -4977,7 +4977,7 @@ array_result_type_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_
49774977

49784978
HPyDef_METH(array_datetime_data, "datetime_data", HPyFunc_VARARGS)
49794979
static HPy
4980-
array_datetime_data_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), HPy *args, HPy_ssize_t nargs)
4980+
array_datetime_data_impl(HPyContext *ctx, HPy NPY_UNUSED(ignored), const HPy *args, size_t nargs)
49814981
{
49824982
HPy h_dtype = HPy_NULL, dtype = HPy_NULL; // PyArray_Descr *
49834983
PyArray_DatetimeMetaData *meta;
@@ -5568,7 +5568,7 @@ _vec_string(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *NPY_UNUSED(kw
55685568

55695569
HPyDef_METH(_hpy_vec_string, "_vec_string", HPyFunc_VARARGS)
55705570
static HPy
5571-
_hpy_vec_string_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), HPy *args, HPy_ssize_t nargs)
5571+
_hpy_vec_string_impl(HPyContext *ctx, HPy NPY_UNUSED(dummy), const HPy *args, size_t nargs)
55725572
{
55735573
HPyErr_SetString(ctx, ctx->h_SystemError, "not ported to HPy yet");
55745574
return HPy_NULL;

‎numpy/core/src/multiarray/nditer_pywrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ npyiter_iternext_impl(HPyContext *ctx, HPy /* NewNpyArrayIterObject * */ h_self)
13941394
HPyDef_METH(npyiter_remove_axis, "remove_axis", HPyFunc_VARARGS)
13951395
static HPy
13961396
npyiter_remove_axis_impl(HPyContext *ctx, HPy /* NewNpyArrayIterObject * */ h_self,
1397-
HPy *args, HPy_ssize_t len_args)
1397+
const HPy *args, size_t len_args)
13981398
{
13991399
int axis = 0;
14001400

@@ -2556,7 +2556,7 @@ npyiter_close_impl(HPyContext *ctx, HPy /* NewNpyArrayIterObject * */ h_self)
25562556
HPyDef_METH(npyiter_exit, "__exit__", HPyFunc_VARARGS)
25572557
static HPy
25582558
npyiter_exit_impl(HPyContext *ctx, HPy /* NewNpyArrayIterObject * */ h_self,
2559-
HPy *args, HPy_ssize_t len_args)
2559+
const HPy *args, size_t len_args)
25602560
{
25612561
/* even if called via exception handling, writeback any data */
25622562
return npyiter_close_impl(ctx, h_self);

0 commit comments

Comments
 (0)
0