8000 BUG: Avoid data race in PyArray_CheckFromAny_int by charris · Pull Request #28160 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Avoid data race in PyArray_CheckFromAny_int #28160

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 1 commit into from
Jan 16, 2025
+29 −13
Merged

BUG: Avoid data race in PyArray_CheckFromAny_int #28160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
BUG: Avoid data race in PyArray_CheckFromAny_int (#28154) 
* BUG: Avoid data race in PyArray_CheckFromAny_int

* TST: add test

* MAINT: simplify byteswapping code in PyArray_CheckFromAny_int

* MAINT: drop ISBYTESWAPPED check
  • Loading branch information
@ngoldbaum @charris
ngoldbaum authored and charris committed Jan 16, 2025
commit 94ac8eecd6e4f8524bd85746e9739d424254a637
16 changes: 5 additions & 11 deletions numpy/_core/src/multiarray/ctors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1829,18 +1829,12 @@ PyArray_CheckFromAny_int(PyObject *op, PyArray_Descr *in_descr,
{
PyObject *obj;
if (requires & NPY_ARRAY_NOTSWAPPED) {
if (!in_descr && PyArray_Check(op) &&
PyArray_ISBYTESWAPPED((PyArrayObject* )op)) {
in_descr = PyArray_DescrNew(PyArray_DESCR((PyArrayObject *)op));
if (in_descr == NULL) {
return NULL;
}
}
else if (in_descr && !PyArray_ISNBO(in_descr->byteorder)) {
PyArray_DESCR_REPLACE(in_descr);
if (!in_descr && PyArray_Check(op)) {
in_descr = PyArray_DESCR((PyArrayObject *)op);
Py_INCREF(in_descr);
}
if (in_descr && in_descr->byteorder != NPY_IGNORE) {
in_descr->byteorder = NPY_NATIVE;
if (in_descr) {
PyArray_DESCR_REPLACE_CANONICAL(in_descr);
}
}

Expand Down
5 changes: 5 additions & 0 deletions numpy/_core/src/multiarray/dtypemeta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ PyArray_SETITEM(PyArrayObject *arr, char *itemptr, PyObject *v)
v, itemptr, arr);
}

// Like PyArray_DESCR_REPLACE, but calls ensure_canonical instead of DescrNew
#define PyArray_DESCR_REPLACE_CANONICAL(descr) do { \
PyArray_Descr *_new_ = NPY_DT_CALL_ensure_canonical(descr); \
Py_XSETREF(descr, _new_); \
} while(0)


#endif /* NUMPY_CORE_SRC_MULTIARRAY_DTYPEMETA_H_ */
13 changes: 13 additions & 0 deletions numpy/_core/tests/test_multithreading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ def closure(b):


def test_parallel_flat_iterator():
# gh-28042
x = np.arange(20).reshape(5, 4).T

def closure(b):
Expand All @@ -142,3 +143,15 @@ def closure(b):
list(x.flat)

run_threaded(closure, outer_iterations=100, pass_barrier=True)

# gh-28143
def prepare_args():
return [np.arange(10)]

def closure(x, b):
b.wait()
for _ in range(100):
y = np.arange(10)
y.flat[x] = x

run_threaded(closure, pass_barrier=True, prepare_args=prepare_args)
8 changes: 6 additions & 2 deletions numpy/testing/_private/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2686,12 +2686,16 @@ def _get_glibc_version():


def run_threaded(func, iters=8, pass_count=False, max_workers=8,
pass_barrier=False, outer_iterations=1):
pass_barrier=False, outer_iterations=1,
prepare_args=None):
"""Runs a function many times in parallel"""
for _ in range(outer_iterations):
with (concurrent.futures.ThreadPoolExecutor(max_workers=max_workers)
as tpe):
args = []
if prepare_args is None:
args = []
else:
args = prepare_args()
if pass_barrier:
if max_workers != iters:
raise RuntimeError(
Expand Down
Loading
0