Skip to content

MAINT: replace PyThread_type_lock with PyMutex on Python >= 3.13.0b3 #27011

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
mattip merged 6 commits into from
Jul 24, 2024
Merged

MAINT: replace PyThread_type_lock with PyMutex on Python >= 3.13.0b3 #27011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a968ea8
MAINT: replace PyThread_type_lock with PyMutex in lapack_lite
ngoldbaum Jul 22, 2024
352760e
MAINT: refactor the import cache to use PyMutex
ngoldbaum Jul 22, 2024
571b60d
MAINT: refactor the identity hash table to use PyMutex
ngoldbaum Jul 22, 2024
d7713e6
MAINT: refactor StringDType to use PyMutex
ngoldbaum Jul 22, 2024
dec1f8d
MAINT: use PyMutex in the argparse cache
ngoldbaum Jul 22, 2024
f92009f
MAINT: simplify identify hash by dropping support for 3.13.0b2 and older
ngoldbaum Jul 24, 2024
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: refactor the identity hash table to use PyMutex
  • Loading branch information
@ngoldbaum
ngoldbaum committed Jul 24, 2024
commit 571b60d727dbe12fbaed5591242d960adac440d0
9 changes: 8 additions & 1 deletion numpy/_core/src/common/npy_hashtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#endif

#ifdef Py_GIL_DISABLED
#if PY_VERSION_HEX < 0x30d00b3
// TODO: replace with PyMutex when it is public
#define LOCK_TABLE(tb) \
if (!PyThread_acquire_lock(tb->mutex, NOWAIT_LOCK)) { \
Expand All @@ -48,6 +49,12 @@
PyThread_free_lock(tb->mutex); \
}
#else
#define LOCK_TABLE(tb) PyMutex_Lock(&tb->mutex)
#define UNLOCK_TABLE(tb) PyMutex_Unlock(&tb->mutex)
#define INITIALIZE_LOCK(tb) memset(&tb->mutex, 0, sizeof(PyMutex))
#define FREE_LOCK(tb)
#endif
#else
// the GIL serializes access to the table so no need
// for locking if it is enabled
#define LOCK_TABLE(tb)
Expand Down Expand Up @@ -252,7 +259,7 @@ PyArrayIdentityHash_SetItem(PyArrayIdentityHash *tb,


NPY_NO_EXPORT PyObject *
PyArrayIdentityHash_GetItem(PyArrayIdentityHash const *tb, PyObject *const *key)
PyArrayIdentityHash_GetItem(PyArrayIdentityHash *tb, PyObject *const *key)
{
LOCK_TABLE(tb);
PyObject *res = find_item(tb, key)[0];
Expand Down
6 changes: 5 additions & 1 deletion numpy/_core/src/common/npy_hashtable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ typedef struct {
npy_intp size; /* current size */
npy_intp nelem; /* number of elements */
#ifdef Py_GIL_DISABLED
#if PY_VERSION_HEX < 0x30d00b3
PyThread_type_lock *mutex;
#else
PyMutex mutex;
#endif
#endif
} PyArrayIdentityHash;

Expand All @@ -24,7 +28,7 @@ PyArrayIdentityHash_SetItem(PyArrayIdentityHash *tb,
PyObject *const *key, PyObject *value, int replace);

NPY_NO_EXPORT PyObject *
PyArrayIdentityHash_GetItem(PyArrayIdentityHash const *tb, PyObject *const *key);
PyArrayIdentityHash_GetItem(PyArrayIdentityHash *tb, PyObject *const *key);

NPY_NO_EXPORT PyArrayIdentityHash *
PyArrayIdentityHash_New(int key_len);
Expand Down