8000 Merge pull request #24017 from seberg/errstate-more-cleanups · numpy/numpy@18e0410 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18e0410

Browse files
sebergseberg
authored
Merge pull request #24017 from seberg/errstate-more-cleanups
MAINT: Further cleanups for errstate
2 parents a67d9ad + 3002a5a commit 18e0410

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

‎numpy/core/src/umath/extobj.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ _check_ufunc_fperr(int errmask, const char *ufunc_name) {
567567

568568

569569
NPY_NO_EXPORT int
570-
_get_bufsize_errmask(const char *ufunc_name, int *buffersize, int *errormask)
570+
_get_bufsize_errmask(int *buffersize, int *errormask)
571571
{
572572
return _extract_pyvals(buffersize, errormask, NULL);
573573
}

‎numpy/core/src/umath/extobj.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ NPY_NO_EXPORT int
3434
_check_ufunc_fperr(int errmask, const char *ufunc_name);
3535

3636
NPY_NO_EXPORT int
37-
_get_bufsize_errmask(const char *ufunc_name, int *buffersize, int *errormask);
37+
_get_bufsize_errmask(int *buffersize, int *errormask);
3838

3939

40 10000 40
NPY_NO_EXPORT int

‎numpy/core/src/umath/ufunc_object.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,7 +2381,7 @@ PyUFunc_GeneralizedFunctionInternal(PyUFuncObject *ufunc,
23812381
#endif
23822382

23832383
/* Get the buffersize and errormask */
2384-
if (_get_bufsize_errmask(ufunc_name, &buffersize, &errormask) < 0) {
2384+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
23852385
retval = -1;
23862386
goto fail;
23872387
}
@@ -2613,18 +2613,16 @@ PyUFunc_GenericFunctionInternal(PyUFuncObject *ufunc,
26132613
{
26142614
int nin = ufunc->nin, nout = ufunc->nout, nop = nin + nout;
26152615

2616-
const char *ufunc_name = ufunc_get_name_cstr(ufunc);
2617-
26182616
npy_intp default_op_out_flags;
26192617
npy_uint32 op_flags[NPY_MAXARGS];
26202618

26212619
/* These parameters come from a TLS global */
26222620
int buffersize = 0, errormask = 0;
26232621

2624-
NPY_UF_DBG_PRINT1("\nEvaluating ufunc %s\n", ufunc_name);
2622+
NPY_UF_DBG_PRINT1("\nEvaluating ufunc %s\n", ufunc_get_name_cstr(ufunc));
26252623

26262624
/* Get the buffersize and errormask */
2627-
if (_get_bufsize_errmask(ufunc_name, &buffersize, &errormask) < 0) {
2625+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
26282626
return -1;
26292627
}
26302628

@@ -2993,7 +2991,7 @@ PyUFunc_Reduce(PyUFuncObject *ufunc,
29932991
axis_flags[axis] = 1;
29942992
}
29952993

2996-
if (_get_bufsize_errmask("reduce", &buffersize, &errormask) < 0) {
2994+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
29972995
return NULL;
29982996
}
29992997

@@ -3052,7 +3050,7 @@ PyUFunc_Accumulate(PyUFuncObject *ufunc, PyArrayObject *arr, PyArrayObject *out,
30523050
printf("\n");
30533051
#endif
30543052

3055-
if (_get_bufsize_errmask("accumulate", &buffersize, &errormask) < 0) {
3053+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
30563054
return NULL;
30573055
}
30583056

@@ -3470,7 +3468,7 @@ PyUFunc_Reduceat(PyUFuncObject *ufunc, PyArrayObject *arr, PyArrayObject *ind,
34703468
printf("Index size is %d\n", (int)ind_size);
34713469
#endif
34723470

3473-
if (_get_bufsize_errmask(opname, &buffersize, &errormask) < 0) {
3471+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
34743472
return NULL;
34753473
}
34763474

@@ -5834,7 +5832,7 @@ trivial_at_loop(PyArrayMethodObject *ufuncimpl, NPY_ARRAYMETHOD_FLAGS flags,
58345832
if (res == 0 && !(flags & NPY_METH_NO_FLOATINGPOINT_ERRORS)) {
58355833
const char * ufunc_name =
58365834
ufunc_get_name_cstr((PyUFuncObject *)context->caller);
5837-
if (_get_bufsize_errmask(ufunc_name, &buffersize, &errormask) < 0) {
5835+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
58385836
return -1;
58395837
}
58405838
res = _check_ufunc_fperr(errormask, ufunc_name);
@@ -5856,7 +5854,7 @@ ufunc_at__fast_iter(PyUFuncObject *ufunc, NPY_ARRAYMETHOD_FLAGS flags,
58565854
int res = 0;
58575855
NPY_BEGIN_THREADS_DEF;
58585856

5859-
if (_get_bufsize_errmask(ufunc->name, &buffersize, &errormask) < 0) {
5857+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
58605858
return -1;
58615859
}
58625860
int needs_api = (flags & NPY_METH_REQUIRES_PYAPI) != 0;
@@ -5934,7 +5932,7 @@ ufunc_at__slow_iter(PyUFuncObject *ufunc, NPY_ARRAYMETHOD_FLAGS flags,
59345932
char * err_msg = NULL;
59355933
NPY_BEGIN_THREADS_DEF;
59365934

5937-
if (_get_bufsize_errmask(ufunc->name, &buffersize, &errormask) < 0) {
5935+
if (_get_bufsize_errmask(&buffersize, &errormask) < 0) {
59385936
return -1;
59395937
}
59405938
array_operands[0] = new_array_op(op1_array, iter->dataptr);

0 commit comments

Comments
 (0)
0