mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-29 08:32:02 +00:00
723307283e
* First pass updating misc files, informed by https://github.com/pybind/pybind11/pull/5177/commits * Remove jobs using silkeh/clang and gcc docker containers that come with Python 3.7 * Add silkeh/clang:17-bookworm * Add job using GCC 7 * Revert "Add job using GCC 7" This reverts commit518515a761
. * Try running in ubuntu-18.04 container under ubuntu-latest (to get GCC 7) * Fix `-` vs `:` mixup. * This reverts commitb1c4304475
. Revert "Try running in ubuntu:18.04 container under ubuntu-latest (to get GCC 7)" This reverts commitb203a294bb
. * `git grep 0x03080000` cleanup. * `git grep -I -E '3\.7'` cleanup. Removes two changes made under pybind/pybind11#3702 * Revert "`git grep -I -E '3\.7'` cleanup." This reverts commitbb5b9d187b
. * Remove comments that are evidently incorrect: ``` ... -- The CXX compiler identification is Clang 15.0.7 ... - Found Python: /usr/bin/python3.9 (found suitable version "3.9.2", minimum required is "3.7") found components: Interpreter Development.Module Development.Embed ... /__w/pybind11/pybind11/include/pybind11/gil.h:150:13: error: 'auto key' can be declared as 'auto *key' [readability-qualified-auto,-warnings-as-errors] auto key = internals.tstate; ^~~~~ auto * /__w/pybind11/pybind11/include/pybind11/gil.h:174:13: error: 'auto key' can be declared as 'auto *key' [readability-qualified-auto,-warnings-as-errors] auto key = detail::get_internals().tstate; ^~~~~ auto * ``` * .github/workflows/configure.yml: Change from Python 3.7 to 3.8 * Misc cleanup pass * Miscellaneous changes based on manual review of the `git grep` matches below: ``` git_grep_37_38.sh |& sort | uniq -c ``` With git_grep_37_38.sh: ``` set -x git grep 0x0307 git grep 0x0308 git grep PY_MINOR_VERSION git grep PYPY_VERSION git grep -I -E '3\.7' git grep -I -E '3\.8' git grep -I -E '\(3, 7' git grep -I -E '\(3, 8' git grep -I -E '3[^A-Za-z0-9.]+7' git grep -I -E '3[^A-Za-z0-9.]+8' ``` Output: ``` 1 .appveyor.yml: $env:CMAKE_INCLUDE_PATH = "eigen-3.3.7;$env:CMAKE_INCLUDE_PATH" 1 .appveyor.yml: 7z x eigen-3.3.7.zip -y > $null 1 .appveyor.yml: Start-FileDownload 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.zip' 1 CMakeLists.txt: # Bug in macOS CMake < 3.7 is unable to download catch 1 CMakeLists.txt: elseif(WINDOWS AND CMAKE_VERSION VERSION_LESS 3.8) 1 CMakeLists.txt: if(OSX AND CMAKE_VERSION VERSION_LESS 3.7) 1 CMakeLists.txt: message(WARNING "CMAKE 3.7+ needed on macOS to download catch, and newer HIGHLY recommended") 1 CMakeLists.txt: message(WARNING "CMAKE 3.8+ tested on Windows, previous versions untested") 1 CMakeLists.txt: # Only tested with 3.8+ in CI. 1 docs/advanced/functions.rst:Python 3.8 introduced a new positional-only argument syntax, using ``/`` in the 1 docs/changelog.rst:* Adapt pybind11 to a C API convention change in Python 3.8. `#1950 1 docs/changelog.rst:* Allow thread termination to be avoided during shutdown for CPython 3.7+ via 1 docs/changelog.rst: considered as conversion, consistent with Python 3.8+. 1 docs/changelog.rst: CPython 3.8 and 3.9 debug builds. 1 docs/changelog.rst:* Enum now has an ``__index__`` method on Python <3.8 too. 1 docs/changelog.rst: on Python 3.8. `#1780 <https://github.com/pybind/pybind11/pull/1780>`_. 1 docs/changelog.rst:* PyPy 3.10 support was added, PyPy 3.7 support was dropped. 2 docs/changelog.rst:* Support PyPy 7.3.7 and the PyPy3.8 beta. Test python-3.11 on PRs with the 1 docs/changelog.rst:* Use ``macos-13`` (Intel) for CI jobs for now (will drop Python 3.7 soon). 1 docs/changelog.rst:* Use new Python 3.7 Thread Specific Storage (TSS) implementation if available. 1 docs/compiling.rst: cmake -DPYBIND11_PYTHON_VERSION=3.8 .. 1 docs/compiling.rst: find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED) 1 docs/limitations.rst:- PyPy3 7.3.1 and 7.3.2 have issues with several tests on 32-bit Windows. 1 docs/requirements.txt:idna==3.7 \ 1 + git grep 0x0307 1 + git grep 0x0308 1 + git grep -I -E '\(3, 7' 1 + git grep -I -E '3\.7' 1 + git grep -I -E '\(3, 8' 1 + git grep -I -E '3\.8' 1 + git grep -I -E '3[^A-Za-z0-9.]+7' 1 + git grep -I -E '3[^A-Za-z0-9.]+8' 1 + git grep PY_MINOR_VERSION 1 + git grep PYPY_VERSION 2 .github/workflows/ci.yml: - '3.8' 1 .github/workflows/ci.yml: - 3.8 1 .github/workflows/ci.yml: - name: Add Python 3.8 1 .github/workflows/ci.yml: - 'pypy-3.8' 2 .github/workflows/ci.yml: python: '3.8' 1 .github/workflows/ci.yml: - python: '3.8' 1 .github/workflows/ci.yml: - python: 3.8 1 .github/workflows/ci.yml: python: 'pypy-3.8' 1 .github/workflows/configure.yml: cmake: "3.8" 1 .github/workflows/configure.yml: name: 🐍 3.8 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }} 1 .github/workflows/configure.yml: - name: Setup Python 3.8 1 .github/workflows/configure.yml: python-version: 3.8 1 .github/workflows/pip.yml: name: 🐍 3.8 • 📦 & 📦 tests • ubuntu-latest 1 .github/workflows/pip.yml: name: 🐍 3.8 • 📦 tests • windows-latest 2 .github/workflows/pip.yml: - name: Setup 🐍 3.8 2 .github/workflows/pip.yml: python-version: 3.8 2 include/pybind11/cast.h:#if !defined(PYPY_VERSION) 2 include/pybind11/cast.h:#if defined(PYPY_VERSION) 2 include/pybind11/cast.h: // PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls. 5 include/pybind11/detail/class.h:#if !defined(PYPY_VERSION) 1 include/pybind11/detail/class.h:#if defined(PYPY_VERSION) 1 include/pybind11/detail/class.h: // This was not needed before Python 3.8 (Python issue 35810) 1 include/pybind11/detail/common.h: && !defined(PYPY_VERSION) && !defined(PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF) 2 include/pybind11/detail/common.h:# error "PYTHON < 3.8 IS UNSUPPORTED. pybind11 v2.13 was the last to support Python 3.7." 1 include/pybind11/detail/common.h:#if defined(PYPY_VERSION) && !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT) 1 include/pybind11/detail/common.h:#if PY_VERSION_HEX < 0x03080000 1 include/pybind11/detail/common.h: = PYBIND11_TOSTRING(PY_MAJOR_VERSION) "." PYBIND11_TOSTRING(PY_MINOR_VERSION); \ 1 include/pybind11/detail/internals.h: // called. PYBIND11_TLS_FREE is PyThread_tss_free on python 3.7+. On older python, it does 1 include/pybind11/detail/internals.h:#if PYBIND11_INTERNALS_VERSION <= 4 || defined(PYPY_VERSION) 1 include/pybind11/detail/internals.h:// The old Python Thread Local Storage (TLS) API is deprecated in Python 3.7 in favor of the new 1 include/pybind11/detail/type_caster_base.h:#if defined(PYPY_VERSION) 1 include/pybind11/embed.h:# define PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX (0x03080000) 1 include/pybind11/embed.h:#if defined(PYPY_VERSION) 1 include/pybind11/eval.h: // globals if not yet present. Python 3.8 made PyRun_String behave 2 include/pybind11/eval.h:#if defined(PYPY_VERSION) 2 include/pybind11/eval.h: // was missing from PyPy3.8 7.3.7. 2 include/pybind11/gil.h: /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and 1 include/pybind11/pybind11.h:#if !defined(PYPY_VERSION) 4 include/pybind11/pybind11.h:#if !defined(PYPY_VERSION) && PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION == 9 1 include/pybind11/pytypes.h:#endif //! defined(PYPY_VERSION) 2 include/pybind11/pytypes.h:#if !defined(PYPY_VERSION) 1 include/pybind11/pytypes.h:# if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030a00 1 include/pybind11/pytypes.h:#ifdef PYPY_VERSION 1 include/pybind11/stl/filesystem.h:# if !defined(PYPY_VERSION) 2 pybind11/__init__.py:if sys.version_info < (3, 8): 2 pybind11/__init__.py: msg = "pybind11 does not support Python < 3.8. v2.13 was the last release supporting Python 3.7." 1 pyproject.toml:master.py-version = "3.8" 1 pyproject.toml:python_version = "3.8" 1 README.rst:lines of code and depend on Python (3.8+, or PyPy) and the C++ 2 README.rst:- Python 3.8+, and PyPy3 7.3 are supported with an implementation-agnostic 1 setup.cfg: Programming Language :: Python :: 3.8 1 setup.cfg:python_requires = >=3.8 1 setup.py:# TODO: use literals & overload (typing extensions or Python 3.8) 1 tests/CMakeLists.txt:if(NOT CMAKE_VERSION VERSION_LESS 3.8) 2 tests/constructor_stats.h:#if defined(PYPY_VERSION) 1 tests/env.py: doesn't work on CPython 3.8.0 with pytest==3.3.2 on Ubuntu 18.04 (#2922). 1 tests/requirements.txt:build~=1.0; python_version>="3.8" 1 tests/requirements.txt:numpy~=1.21.5; platform_python_implementation!="PyPy" and python_version>="3.8" and python_version<"3.10" 1 tests/requirements.txt:numpy~=1.23.0; python_version=="3.8" and platform_python_implementation=="PyPy" 1 tests/test_buffers.py: env.PYPY, reason="PyPy 7.3.7 doesn't clear this anymore", strict=False 1 tests/test_builtin_casters.py: # Before Python 3.8, `PyLong_AsLong` does not pick up on `obj.__index__`, 2 tests/test_builtin_casters.py: if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON: 4 tests/test_builtin_casters.py: # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7) 1 tests/test_callbacks.py: assert m.test_callback3(z.double) == "func(43) = 86" 2 tests/test_call_policies.cpp:#if !defined(PYPY_VERSION) 1 tests/test_chrono.py: diff = m.test_chrono_float_diff(43.789012, 1.123456) 1 tests/test_constants_and_functions.py: assert m.f3(86) == 89 1 tests/test_eigen_matrix.py: a_copy3[8, 1] = 11 1 tests/test_eigen_matrix.py: assert np.all(cornersc == np.array([[1.0, 3], [7, 9]])) 1 tests/test_eigen_matrix.py: assert np.all(cornersr == np.array([[1.0, 3], [7, 9]])) 1 tests/test_eigen_matrix.py: mymat = chol(np.array([[1.0, 2, 4], [2, 13, 23], [4, 23, 77]])) 1 tests/test_exceptions.py: if hasattr(pytest, unraisable): # Python >= 3.8 and pytest >= 6 2 tests/test_exceptions.py:@pytest.mark.xfail(env.PYPY, reason="Failure on PyPy 3.8 (7.3.7)", strict=False) 1 tests/test_factory_constructors.py: assert [i.alive() for i in cstats] == [13, 7] 1 tests/test_kwargs_and_defaults.cpp:#ifdef PYPY_VERSION 1 tests/test_local_bindings.py: assert i1.get3() == 8 1 tests/test_methods_and_attributes.cpp:#if !defined(PYPY_VERSION) 1 tests/test_numpy_array.py: a = np.arange(3 * 7 * 2) + 1 1 tests/test_numpy_array.py: assert str(excinfo.value) == "cannot reshape array of size 42 into shape (3,7,1)" 2 tests/test_numpy_array.py: assert x.shape == (3, 7, 2) 2 tests/test_numpy_array.py: m.reshape_tuple(a, (3, 7, 1)) 2 tests/test_numpy_array.py: x = m.reshape_tuple(a, (3, 7, 2)) 1 tests/test_numpy_vectorize.py: assert np.isclose(m.vectorized_func3(np.array(3 + 7j)), [6 + 14j]) 1 tests/test_pickling.cpp:#if !defined(PYPY_VERSION) 1 tests/test_pytypes.cpp:#if (defined(__APPLE__) && defined(__clang__)) || defined(PYPY_VERSION) 1 tests/test_smart_ptr.cpp: m.def("make_myobject3_1", []() { return new MyObject3(8); }); 1 tests/test_smart_ptr.py: assert cstats.values() == ["MyObject3[9]", "MyObject3[8]", "MyObject3[9]"] 1 tests/test_stl_binders.py: assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88]) 1 tests/test_stl_binders.py: assert v_int2 == m.VectorInt([0, 99, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 88, 4]) 1 tests/test_type_caster_pyobject_ptr.cpp:#if !defined(PYPY_VERSION) // It is not worth the trouble doing something special for PyPy. 1 tools/FindPythonLibsNew.cmake: set(PythonLibsNew_FIND_VERSION "3.8") 1 tools/JoinPaths.cmake:# https://docs.python.org/3.7/library/os.path.html#os.path.join 1 tools/pybind11NewTools.cmake: Python 3.8 REQUIRED COMPONENTS ${_pybind11_interp_component} ${_pybind11_dev_component} 1 tools/pybind11NewTools.cmake:# Python debug libraries expose slightly different objects before 3.8 1 tools/pybind11Tools.cmake: "3.12;3.11;3.10;3.9;3.8" 1 tools/pybind11Tools.cmake: if(NOT DEFINED PYPY_VERSION) 1 tools/pybind11Tools.cmake: message(STATUS "PYPY ${PYPY_VERSION} (Py ${PYTHON_VERSION})") 1 tools/pybind11Tools.cmake:# Python debug libraries expose slightly different objects before 3.8 1 tools/pybind11Tools.cmake: set(PYPY_VERSION ``` * Change `[tool.ruff]` `target-version` to `"py38"`, as suggested by @Skylion007
216 lines
7.3 KiB
C++
216 lines
7.3 KiB
C++
/*
|
|
pybind11/gil.h: RAII helpers for managing the GIL
|
|
|
|
Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
|
|
|
|
All rights reserved. Use of this source code is governed by a
|
|
BSD-style license that can be found in the LICENSE file.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "detail/common.h"
|
|
|
|
#include <cassert>
|
|
|
|
#if !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
|
|
# include "detail/internals.h"
|
|
#endif
|
|
|
|
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
|
|
|
|
PYBIND11_NAMESPACE_BEGIN(detail)
|
|
|
|
// forward declarations
|
|
PyThreadState *get_thread_state_unchecked();
|
|
|
|
PYBIND11_NAMESPACE_END(detail)
|
|
|
|
#if !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
|
|
|
|
/* The functions below essentially reproduce the PyGILState_* API using a RAII
|
|
* pattern, but there are a few important differences:
|
|
*
|
|
* 1. When acquiring the GIL from an non-main thread during the finalization
|
|
* phase, the GILState API blindly terminates the calling thread, which
|
|
* is often not what is wanted. This API does not do this.
|
|
*
|
|
* 2. The gil_scoped_release function can optionally cut the relationship
|
|
* of a PyThreadState and its associated thread, which allows moving it to
|
|
* another thread (this is a fairly rare/advanced use case).
|
|
*
|
|
* 3. The reference count of an acquired thread state can be controlled. This
|
|
* can be handy to prevent cases where callbacks issued from an external
|
|
* thread would otherwise constantly construct and destroy thread state data
|
|
* structures.
|
|
*
|
|
* See the Python bindings of NanoGUI (http://github.com/wjakob/nanogui) for an
|
|
* example which uses features 2 and 3 to migrate the Python thread of
|
|
* execution to another thread (to run the event loop on the original thread,
|
|
* in this case).
|
|
*/
|
|
|
|
class gil_scoped_acquire {
|
|
public:
|
|
PYBIND11_NOINLINE gil_scoped_acquire() {
|
|
auto &internals = detail::get_internals();
|
|
tstate = (PyThreadState *) PYBIND11_TLS_GET_VALUE(internals.tstate);
|
|
|
|
if (!tstate) {
|
|
/* Check if the GIL was acquired using the PyGILState_* API instead (e.g. if
|
|
calling from a Python thread). Since we use a different key, this ensures
|
|
we don't create a new thread state and deadlock in PyEval_AcquireThread
|
|
below. Note we don't save this state with internals.tstate, since we don't
|
|
create it we would fail to clear it (its reference count should be > 0). */
|
|
tstate = PyGILState_GetThisThreadState();
|
|
}
|
|
|
|
if (!tstate) {
|
|
tstate = PyThreadState_New(internals.istate);
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (!tstate) {
|
|
pybind11_fail("scoped_acquire: could not create thread state!");
|
|
}
|
|
# endif
|
|
tstate->gilstate_counter = 0;
|
|
PYBIND11_TLS_REPLACE_VALUE(internals.tstate, tstate);
|
|
} else {
|
|
release = detail::get_thread_state_unchecked() != tstate;
|
|
}
|
|
|
|
if (release) {
|
|
PyEval_AcquireThread(tstate);
|
|
}
|
|
|
|
inc_ref();
|
|
}
|
|
|
|
gil_scoped_acquire(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
|
|
|
|
void inc_ref() { ++tstate->gilstate_counter; }
|
|
|
|
PYBIND11_NOINLINE void dec_ref() {
|
|
--tstate->gilstate_counter;
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (detail::get_thread_state_unchecked() != tstate) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): thread state must be current!");
|
|
}
|
|
if (tstate->gilstate_counter < 0) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): reference count underflow!");
|
|
}
|
|
# endif
|
|
if (tstate->gilstate_counter == 0) {
|
|
# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
|
|
if (!release) {
|
|
pybind11_fail("scoped_acquire::dec_ref(): internal error!");
|
|
}
|
|
# endif
|
|
PyThreadState_Clear(tstate);
|
|
if (active) {
|
|
PyThreadState_DeleteCurrent();
|
|
}
|
|
PYBIND11_TLS_DELETE_VALUE(detail::get_internals().tstate);
|
|
release = false;
|
|
}
|
|
}
|
|
|
|
/// This method will disable the PyThreadState_DeleteCurrent call and the
|
|
/// GIL won't be acquired. This method should be used if the interpreter
|
|
/// could be shutting down when this is called, as thread deletion is not
|
|
/// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
|
|
/// protect subsequent code.
|
|
PYBIND11_NOINLINE void disarm() { active = false; }
|
|
|
|
PYBIND11_NOINLINE ~gil_scoped_acquire() {
|
|
dec_ref();
|
|
if (release) {
|
|
PyEval_SaveThread();
|
|
}
|
|
}
|
|
|
|
private:
|
|
PyThreadState *tstate = nullptr;
|
|
bool release = true;
|
|
bool active = true;
|
|
};
|
|
|
|
class gil_scoped_release {
|
|
public:
|
|
// PRECONDITION: The GIL must be held when this constructor is called.
|
|
explicit gil_scoped_release(bool disassoc = false) : disassoc(disassoc) {
|
|
assert(PyGILState_Check());
|
|
// `get_internals()` must be called here unconditionally in order to initialize
|
|
// `internals.tstate` for subsequent `gil_scoped_acquire` calls. Otherwise, an
|
|
// initialization race could occur as multiple threads try `gil_scoped_acquire`.
|
|
auto &internals = detail::get_internals();
|
|
// NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
|
|
tstate = PyEval_SaveThread();
|
|
if (disassoc) {
|
|
auto key = internals.tstate; // NOLINT(readability-qualified-auto)
|
|
PYBIND11_TLS_DELETE_VALUE(key);
|
|
}
|
|
}
|
|
|
|
gil_scoped_release(const gil_scoped_release &) = delete;
|
|
gil_scoped_release &operator=(const gil_scoped_release &) = delete;
|
|
|
|
/// This method will disable the PyThreadState_DeleteCurrent call and the
|
|
/// GIL won't be acquired. This method should be used if the interpreter
|
|
/// could be shutting down when this is called, as thread deletion is not
|
|
/// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
|
|
/// protect subsequent code.
|
|
PYBIND11_NOINLINE void disarm() { active = false; }
|
|
|
|
~gil_scoped_release() {
|
|
if (!tstate) {
|
|
return;
|
|
}
|
|
// `PyEval_RestoreThread()` should not be called if runtime is finalizing
|
|
if (active) {
|
|
PyEval_RestoreThread(tstate);
|
|
}
|
|
if (disassoc) {
|
|
auto key = detail::get_internals().tstate; // NOLINT(readability-qualified-auto)
|
|
PYBIND11_TLS_REPLACE_VALUE(key, tstate);
|
|
}
|
|
}
|
|
|
|
private:
|
|
PyThreadState *tstate;
|
|
bool disassoc;
|
|
bool active = true;
|
|
};
|
|
|
|
#else // PYBIND11_SIMPLE_GIL_MANAGEMENT
|
|
|
|
class gil_scoped_acquire {
|
|
PyGILState_STATE state;
|
|
|
|
public:
|
|
gil_scoped_acquire() : state{PyGILState_Ensure()} {}
|
|
gil_scoped_acquire(const gil_scoped_acquire &) = delete;
|
|
gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
|
|
~gil_scoped_acquire() { PyGILState_Release(state); }
|
|
void disarm() {}
|
|
};
|
|
|
|
class gil_scoped_release {
|
|
PyThreadState *state;
|
|
|
|
public:
|
|
// PRECONDITION: The GIL must be held when this constructor is called.
|
|
gil_scoped_release() {
|
|
assert(PyGILState_Check());
|
|
state = PyEval_SaveThread();
|
|
}
|
|
gil_scoped_release(const gil_scoped_release &) = delete;
|
|
gil_scoped_release &operator=(const gil_scoped_release &) = delete;
|
|
~gil_scoped_release() { PyEval_RestoreThread(state); }
|
|
void disarm() {}
|
|
};
|
|
|
|
#endif // PYBIND11_SIMPLE_GIL_MANAGEMENT
|
|
|
|
PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
|