-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into array_t-handle-object
- Loading branch information
Showing
37 changed files
with
1,013 additions
and
264 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| NOTE | ||
| ---- | ||
|
|
||
| The C++ code here | ||
|
|
||
| ** only depends on <Python.h> ** | ||
|
|
||
| and nothing else. | ||
|
|
||
| DO NOT ADD CODE WITH OTHER EXTERNAL DEPENDENCIES TO THIS DIRECTORY. | ||
|
|
||
| Read on: | ||
|
|
||
| pybind11_conduit_v1.h — Type-safe interoperability between different | ||
| independent Python/C++ bindings systems. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // Copyright (c) 2024 The pybind Community. | ||
|
|
||
| /* The pybind11_conduit_v1 feature enables type-safe interoperability between | ||
| * different independent Python/C++ bindings systems, | ||
| * including pybind11 versions with different PYBIND11_INTERNALS_VERSION's. | ||
| The naming of the feature is a bit misleading: | ||
| * The feature is in no way tied to pybind11 internals. | ||
| * It just happens to originate from pybind11 and currently still lives there. | ||
| * The only external dependency is <Python.h>. | ||
| The implementation is a VERY light-weight dependency. It is designed to be | ||
| compatible with any ISO C++11 (or higher) compiler, and does NOT require | ||
| C++ Exception Handling to be enabled. | ||
| Please see https://github.com/pybind/pybind11/pull/5296 for more background. | ||
| The implementation involves a | ||
| def _pybind11_conduit_v1_( | ||
| self, | ||
| pybind11_platform_abi_id: bytes, | ||
| cpp_type_info_capsule: capsule, | ||
| pointer_kind: bytes) -> capsule | ||
| method that is meant to be added to Python objects wrapping C++ objects | ||
| (e.g. pybind11::class_-wrapped types). | ||
| The design of the _pybind11_conduit_v1_ feature provides two layers of | ||
| protection against C++ ABI mismatches: | ||
| * The first and most important layer is that the pybind11_platform_abi_id's | ||
| must match between extensions. — This will never be perfect, but is the same | ||
| pragmatic approach used in pybind11 since 2017 | ||
| (https://github.com/pybind/pybind11/commit/96997a4b9d4ec3d389a570604394af5d5eee2557, | ||
| PYBIND11_INTERNALS_ID). | ||
| * The second layer is that the typeid(std::type_info).name()'s must match | ||
| between extensions. | ||
| The implementation below (which is shorter than this comment!), serves as a | ||
| battle-tested specification. The main API is this one function: | ||
| auto *cpp_pointer = pybind11_conduit_v1::get_type_pointer_ephemeral<YourType>(py_obj); | ||
| It is meant to be a minimalistic reference implementation, intentionally | ||
| without comprehensive error reporting. It is expected that major bindings | ||
| systems will roll their own, compatible implementations, potentially with | ||
| system-specific error reporting. The essential specifications all bindings | ||
| systems need to agree on are merely: | ||
| * PYBIND11_PLATFORM_ABI_ID (const char* literal). | ||
| * The cpp_type_info capsule (see below: a void *ptr and a const char *name). | ||
| * The cpp_conduit capsule (see below: a void *ptr and a const char *name). | ||
| * "raw_pointer_ephemeral" means: the lifetime of the pointer is the lifetime | ||
| of the py_obj. | ||
| */ | ||
|
|
||
| // THIS MUST STAY AT THE TOP! | ||
| #include "pybind11_platform_abi_id.h" | ||
|
|
||
| #include <Python.h> | ||
| #include <typeinfo> | ||
|
|
||
| namespace pybind11_conduit_v1 { | ||
|
|
||
| inline void *get_raw_pointer_ephemeral(PyObject *py_obj, const std::type_info *cpp_type_info) { | ||
| PyObject *cpp_type_info_capsule | ||
| = PyCapsule_New(const_cast<void *>(static_cast<const void *>(cpp_type_info)), | ||
| typeid(std::type_info).name(), | ||
| nullptr); | ||
| if (cpp_type_info_capsule == nullptr) { | ||
| return nullptr; | ||
| } | ||
| PyObject *cpp_conduit = PyObject_CallMethod(py_obj, | ||
| "_pybind11_conduit_v1_", | ||
| "yOy", | ||
| PYBIND11_PLATFORM_ABI_ID, | ||
| cpp_type_info_capsule, | ||
| "raw_pointer_ephemeral"); | ||
| Py_DECREF(cpp_type_info_capsule); | ||
| if (cpp_conduit == nullptr) { | ||
| return nullptr; | ||
| } | ||
| void *raw_ptr = PyCapsule_GetPointer(cpp_conduit, cpp_type_info->name()); | ||
| Py_DECREF(cpp_conduit); | ||
| if (PyErr_Occurred()) { | ||
| return nullptr; | ||
| } | ||
| return raw_ptr; | ||
| } | ||
|
|
||
| template <typename T> | ||
| T *get_type_pointer_ephemeral(PyObject *py_obj) { | ||
| void *raw_ptr = get_raw_pointer_ephemeral(py_obj, &typeid(T)); | ||
| if (raw_ptr == nullptr) { | ||
| return nullptr; | ||
| } | ||
| return static_cast<T *>(raw_ptr); | ||
| } | ||
|
|
||
| } // namespace pybind11_conduit_v1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| #pragma once | ||
|
|
||
| // Copyright (c) 2024 The pybind Community. | ||
|
|
||
| // To maximize reusability: | ||
| // DO NOT ADD CODE THAT REQUIRES C++ EXCEPTION HANDLING. | ||
|
|
||
| #include "wrap_include_python_h.h" | ||
|
|
||
| // Implementation details. DO NOT USE ELSEWHERE. (Unfortunately we cannot #undef them.) | ||
| // This is duplicated here to maximize portability. | ||
| #define PYBIND11_PLATFORM_ABI_ID_STRINGIFY(x) #x | ||
| #define PYBIND11_PLATFORM_ABI_ID_TOSTRING(x) PYBIND11_PLATFORM_ABI_ID_STRINGIFY(x) | ||
|
|
||
| // On MSVC, debug and release builds are not ABI-compatible! | ||
| #if defined(_MSC_VER) && defined(_DEBUG) | ||
| # define PYBIND11_BUILD_TYPE "_debug" | ||
| #else | ||
| # define PYBIND11_BUILD_TYPE "" | ||
| #endif | ||
|
|
||
| // Let's assume that different compilers are ABI-incompatible. | ||
| // A user can manually set this string if they know their | ||
| // compiler is compatible. | ||
| #ifndef PYBIND11_COMPILER_TYPE | ||
| # if defined(_MSC_VER) | ||
| # define PYBIND11_COMPILER_TYPE "_msvc" | ||
| # elif defined(__INTEL_COMPILER) | ||
| # define PYBIND11_COMPILER_TYPE "_icc" | ||
| # elif defined(__clang__) | ||
| # define PYBIND11_COMPILER_TYPE "_clang" | ||
| # elif defined(__PGI) | ||
| # define PYBIND11_COMPILER_TYPE "_pgi" | ||
| # elif defined(__MINGW32__) | ||
| # define PYBIND11_COMPILER_TYPE "_mingw" | ||
| # elif defined(__CYGWIN__) | ||
| # define PYBIND11_COMPILER_TYPE "_gcc_cygwin" | ||
| # elif defined(__GNUC__) | ||
| # define PYBIND11_COMPILER_TYPE "_gcc" | ||
| # else | ||
| # define PYBIND11_COMPILER_TYPE "_unknown" | ||
| # endif | ||
| #endif | ||
|
|
||
| // Also standard libs | ||
| #ifndef PYBIND11_STDLIB | ||
| # if defined(_LIBCPP_VERSION) | ||
| # define PYBIND11_STDLIB "_libcpp" | ||
| # elif defined(__GLIBCXX__) || defined(__GLIBCPP__) | ||
| # define PYBIND11_STDLIB "_libstdcpp" | ||
| # else | ||
| # define PYBIND11_STDLIB "" | ||
| # endif | ||
| #endif | ||
|
|
||
| #ifndef PYBIND11_BUILD_ABI | ||
| # if defined(__GXX_ABI_VERSION) // Linux/OSX. | ||
| # define PYBIND11_BUILD_ABI "_cxxabi" PYBIND11_PLATFORM_ABI_ID_TOSTRING(__GXX_ABI_VERSION) | ||
| # elif defined(_MSC_VER) // See PR #4953. | ||
| # if defined(_MT) && defined(_DLL) // Corresponding to CL command line options /MD or /MDd. | ||
| # if (_MSC_VER) / 100 == 19 | ||
| # define PYBIND11_BUILD_ABI "_md_mscver19" | ||
| # else | ||
| # error "Unknown major version for MSC_VER: PLEASE REVISE THIS CODE." | ||
| # endif | ||
| # elif defined(_MT) // Corresponding to CL command line options /MT or /MTd. | ||
| # define PYBIND11_BUILD_ABI "_mt_mscver" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_MSC_VER) | ||
| # else | ||
| # if (_MSC_VER) / 100 == 19 | ||
| # define PYBIND11_BUILD_ABI "_none_mscver19" | ||
| # else | ||
| # error "Unknown major version for MSC_VER: PLEASE REVISE THIS CODE." | ||
| # endif | ||
| # endif | ||
| # elif defined(__NVCOMPILER) // NVHPC (PGI-based). | ||
| # define PYBIND11_BUILD_ABI "" // TODO: What should be here, to prevent UB? | ||
| # else | ||
| # error "Unknown platform or compiler: PLEASE REVISE THIS CODE." | ||
| # endif | ||
| #endif | ||
|
|
||
| #ifndef PYBIND11_INTERNALS_KIND | ||
| # define PYBIND11_INTERNALS_KIND "" | ||
| #endif | ||
|
|
||
| #define PYBIND11_PLATFORM_ABI_ID \ | ||
| PYBIND11_INTERNALS_KIND PYBIND11_COMPILER_TYPE PYBIND11_STDLIB PYBIND11_BUILD_ABI \ | ||
| PYBIND11_BUILD_TYPE |
Oops, something went wrong.