mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-13 09:03:54 +00:00
48f25275c4
* Put bakein branch @ 18b72c0ffa on top of smart_holder branch:
Commands used:
```
git checkout bakein
git diff smart_holder > ~/zd
git checkout smart_holder
git checkout -b bakein_sh
patch -p 1 < ~/zd
git checkout smart_holder \
MANIFEST.in \
README.rst \
README_smart_holder.rst \
docs/advanced/smart_ptrs.rst \
ubench/holder_comparison.cpp \
ubench/holder_comparison.py \
ubench/holder_comparison_extract_sheet_data.py \
ubench/number_bucket.h \
ubench/python/number_bucket.clif
git add -A
```
* Add back README_smart_holder.rst in tests/extra_python_package/test_files.py
* Restore smart_holder_poc.h as-is on smart_holder branch (i.e. undo `PYBIND11_SMART_HOLDER_PADDING`, which was meant for stress-testing only).
* Insert `std::move()` as suggested by @laramiel
* `property_cpp_function_sh_*` named specializations, as suggested by @laramiel (https://github.com/pybind/pybind11/pull/5257#discussion_r1688346807)
* Call `property_cpp_function_classic` member functions, rather than inlining the implementations.
* Use `PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT` in holder_comparison.cpp (holder_comparison.py is NOT changed accordingly in this commit, i.e. can still only be run if the smart_holder functionality is available).
* Systematically rename `loaded_as` to `load_as` (`shared_ptr`, `unique_ptr`) as suggested by @laramiel
* Make change as suggested by @laramiel. This makes it much more obvious that the latest implementation of `smart_holder_from_unique_ptr()` accepts all existing `return_value_policy` enum values except `copy`.
* Resolve `BAKEIN_WIP: Rewrite comment.` for `property_cpp_function_*` specializations.
* Resolve `BAKEIN_WIP: Add comment to explain: This is meant for stress-testing only.`
* Resolve all remaining BAKEIN_WIP (in pybind11/cast.h).
Leave only two pairs of SMART_HOLDER_BAKEIN_FOLLOW_ON comments: refactoring of copyable_holder_caster, move_only_holder_caster. This is best left until after the smart_holder branch is merged into the master branch.
* Remove obsolete `using holder_type = smart_holder;` in `load_helper`
* Add SMART_HOLDER_BAKEIN_FOLLOW_ON comment for `internals::default_holder`
* README_smart_holder.rst update (line count reduced from 356 to 123).
63 lines
1.8 KiB
Python
63 lines
1.8 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import class_sh_trampoline_basic as m
|
|
|
|
if not m.defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT:
|
|
pytest.skip("smart_holder not available.", allow_module_level=True)
|
|
|
|
|
|
class PyDrvd0(m.Abase0):
|
|
def __init__(self, val):
|
|
super().__init__(val)
|
|
|
|
def Add(self, other_val):
|
|
return self.Get() * 100 + other_val
|
|
|
|
|
|
class PyDrvd1(m.Abase1):
|
|
def __init__(self, val):
|
|
super().__init__(val)
|
|
|
|
def Add(self, other_val):
|
|
return self.Get() * 200 + other_val
|
|
|
|
|
|
def test_drvd0_add():
|
|
drvd = PyDrvd0(74)
|
|
assert drvd.Add(38) == (74 * 10 + 3) * 100 + 38
|
|
|
|
|
|
def test_drvd0_add_in_cpp_raw_ptr():
|
|
drvd = PyDrvd0(52)
|
|
assert m.AddInCppRawPtr(drvd, 27) == ((52 * 10 + 3) * 100 + 27) * 10 + 7
|
|
|
|
|
|
def test_drvd0_add_in_cpp_shared_ptr():
|
|
while True:
|
|
drvd = PyDrvd0(36)
|
|
assert m.AddInCppSharedPtr(drvd, 56) == ((36 * 10 + 3) * 100 + 56) * 100 + 11
|
|
return # Comment out for manual leak checking (use `top` command).
|
|
|
|
|
|
def test_drvd0_add_in_cpp_unique_ptr():
|
|
while True:
|
|
drvd = PyDrvd0(0)
|
|
with pytest.raises(ValueError) as exc_info:
|
|
m.AddInCppUniquePtr(drvd, 0)
|
|
assert (
|
|
str(exc_info.value)
|
|
== "Alias class (also known as trampoline) does not inherit from"
|
|
" py::trampoline_self_life_support, therefore the ownership of this"
|
|
" instance cannot safely be transferred to C++."
|
|
)
|
|
return # Comment out for manual leak checking (use `top` command).
|
|
|
|
|
|
def test_drvd1_add_in_cpp_unique_ptr():
|
|
while True:
|
|
drvd = PyDrvd1(25)
|
|
assert m.AddInCppUniquePtr(drvd, 83) == ((25 * 10 + 3) * 200 + 83) * 100 + 13
|
|
return # Comment out for manual leak checking (use `top` command).
|