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

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: use PyMutex in the argparse cache
  • Loading branch information
@ngoldbaum
ngoldbaum committed Jul 24, 2024
commit dec1f8de33969dac845c98f47b60caf2f012893d
18 changes: 15 additions & 3 deletions numpy/_core/src/common/npy_argparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,27 @@

#include "arrayfunction_override.h"

#if PY_VERSION_HEX < 0x30d00b3
static PyThread_type_lock argparse_mutex;
#define LOCK_ARGPARSE_MUTEX \
PyThread_acquire_lock(argparse_mutex, WAIT_LOCK)
#define UNLOCK_ARGPARSE_MUTEX \
PyThread_release_lock(argparse_mutex)
#else
static PyMutex argparse_mutex = {0};
#define LOCK_ARGPARSE_MUTEX PyMutex_Lock(&argparse_mutex)
#define UNLOCK_ARGPARSE_MUTEX PyMutex_Unlock(&argparse_mutex)
#endif

NPY_NO_EXPORT int
init_argparse_mutex(void) {
#if PY_VERSION_HEX < 0x30d00b3
argparse_mutex = PyThread_allocate_lock();
if (argparse_mutex == NULL) {
PyErr_NoMemory();
return -1;
}
#endif
return 0;
}

Expand Down Expand Up @@ -286,19 +298,19 @@ _npy_parse_arguments(const char *funcname,
...)
{
if (!npy_atomic_load_uint8(&cache->initialized)) {
PyThread_acquire_lock(argparse_mutex, WAIT_LOCK);
LOCK_ARGPARSE_MUTEX;
if (!npy_atomic_load_uint8(&cache->initialized)) {
va_list va;
va_start(va, kwnames);
int res = initialize_keywords(funcname, cache, va);
va_end(va);
if (res < 0) {
PyThread_release_lock(argparse_mutex);
UNLOCK_ARGPARSE_MUTEX;
return -1;
}
npy_atomic_store_uint8(&cache->initialized, 1);
}
PyThread_release_lock(argparse_mutex);
UNLOCK_ARGPARSE_MUTEX;
}

if (NPY_UNLIKELY(len_args > cache->npositional)) {
Expand Down