10000 ENH,API: Make the errstate/extobj a contextvar by seberg · Pull Request #23936 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH,API: Make the errstate/extobj a contextvar #23936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 16, 2023
Merged

ENH,API: Make the errstate/extobj a contextvar #23936

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2008107
MAINT: Refactor away helper and remove errstate default optimization
seberg Jun 13, 2023
1c7a8a8
MAINT: Untangle error callable `pyfunc` and ufunc name
seberg Jun 13, 2023
ddd7c13
MAINT: Remove unused `first` handling in ufunc exception raising
seberg Jun 13, 2023
fb9eae0
ENH: Working restructure of the errstate/extobj into a contextvar
seberg Jun 13, 2023
634b69e
MAINT: Unceremonously remove errobj/extobj related constants
seberg Jun 13, 2023
b59042e
MAINT: Silence compiler warning about uninitialized value
seberg Jun 13, 2023
0c42ce1
MAINT: Expose `_extobj_contextvar` to python and reset from there
seberg Jun 14, 2023
fab91cd
MAINT: Create extobj in C but set contextvar in python (also rename f…
seberg Jun 14, 2023
73be58f
DOC: Add errstate changes release note and note to setbufsize.
seberg Jun 14, 2023
a20ca21
DOC: Apply doc fixes from review
seberg Jun 14, 2023
0b896db
BUG: Fix segfault due to missing incref when exposing _extobj_contextvar
seberg Jun 14, 2023
a2ce769
BUG: Fix context var setting in `seterrcall`
seberg Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MAINT: Remove unused first handling in ufunc exception raising
  • Loading branch information
@seberg
seberg committed Jun 14, 2023
commit ddd7c13be292159523b2ef99aa23c68d444db27b
52 changes: 21 additions & 31 deletions numpy/core/src/umath/extobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@

static int
_error_handler(const char *name, int method, PyObject *pyfunc, char *errtype,
int retstatus, int *first);
int retstatus);


#define HANDLEIT(NAME, str) {if (retstatus & NPY_FPE_##NAME) { \
handle = errmask & UFUNC_MASK_##NAME; \
if (handle && \
_error_handler(name, handle >> UFUNC_SHIFT_##NAME, \
pyfunc, str, retstatus, first) < 0) \
pyfunc, str, retstatus) < 0) \
return -1; \
}}


static int
PyUFunc_handlefperr(
const char *name, int errmask, PyObject *pyfunc, int retstatus,
int *first)
const char *name, int errmask, PyObject *pyfunc, int retstatus)
{
int handle;
if (errmask && retstatus) {
Expand All @@ -51,8 +50,7 @@ PyUFunc_handlefperr(
/*
* fpstatus is the ufunc_formatted hardware status
* errmask is the handling mask specified by the user.
* errobj is a Python object with (string, callable object or None)
* or NULL
* pyfunc is a Python callable or write method (logging).
*/

/*
Expand All @@ -66,7 +64,7 @@ PyUFunc_handlefperr(

static int
_error_handler(const char *name, int method, PyObject *pyfunc, char *errtype,
int retstatus, int *first)
int retstatus)
{
PyObject *ret, *args;
char msg[100];
Expand All @@ -80,10 +78,7 @@ _error_handler(const char *name, int method, PyObject *pyfunc, char *errtype,

/* don't need C API for a simple print */
if (method == UFUNC_ERR_PRINT) {
if (*first) {
fprintf(stderr, "Warning: %s encountered in %s\n", errtype, name);
*first = 0;
}
fprintf(stderr, "Warning: %s encountered in %s\n", errtype, name);
return 0;
}

Expand Down Expand Up @@ -120,23 +115,20 @@ _error_handler(const char *name, int method, PyObject *pyfunc, char *errtype,
Py_DECREF(ret);
break;
case UFUNC_ERR_LOG:
if (first) {
*first = 0;
if (pyfunc == Py_None) {
PyErr_Format(PyExc_NameError,
"log specified for %s (in %s) but no " \
"object with write method found.",
errtype, name);
goto fail;
}
PyOS_snprintf(msg, sizeof(msg),
"Warning: %s encountered in %s\n", errtype, name);
ret = PyObject_CallMethod(pyfunc, "write", "s", msg);
if (ret == NULL) {
goto fail;
}
Py_DECREF(ret);
if (pyfunc == Py_None) {
PyErr_Format(PyExc_NameError,
"log specified for %s (in %s) but no " \
"object with write method found.",
errtype, name);
goto fail;
}
PyOS_snprintf(msg, sizeof(msg),
"Warning: %s encountered in %s\n", errtype, name);
ret = PyObject_CallMethod(pyfunc, "write", "s", msg);
if (ret == NULL) {
goto fail;
}
Py_DECREF(ret);
break;
}
NPY_DISABLE_C_API;
Expand Down Expand Up @@ -279,8 +271,7 @@ PyUFunc_GiveFloatingpointErrors(const char *name, int fpe_errors)
Py_XDECREF(pyfunc);
return -1;
}
int first = 1;
if (PyUFunc_handlefperr(name, errmask, pyfunc, fpe_errors, &first)) {
if (PyUFunc_handlefperr(name, errmask, pyfunc, fpe_errors)) {
Py_XDECREF(pyfunc);
return -1;
}
Expand All @@ -301,7 +292,6 @@ _check_ufunc_fperr(int errmask, const char *ufunc_name) {
int fperr;
PyObject *pyfunc = NULL;
int ret;
int first = 1;

if (!errmask) {
return 0;
Expand All @@ -317,7 +307,7 @@ _check_ufunc_fperr(int errmask, const char *ufunc_name) {
return -1;
}

ret = PyUFunc_handlefperr(ufunc_name, errmask, pyfunc, fperr, &first);
ret = PyUFunc_handlefperr(ufunc_name, errmask, pyfunc, fperr);
Py_XDECREF(pyfunc);

return ret;
Expand Down
0