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).
69 lines
1.9 KiB
Python
69 lines
1.9 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import class_sh_inheritance as m
|
|
|
|
if not m.defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT:
|
|
pytest.skip("smart_holder not available.", allow_module_level=True)
|
|
|
|
|
|
def test_rtrn_mptr_drvd_pass_cptr_base():
|
|
d = m.rtrn_mptr_drvd()
|
|
i = m.pass_cptr_base(d) # load_impl Case 2a
|
|
assert i == 2 * 100 + 11
|
|
|
|
|
|
def test_rtrn_shmp_drvd_pass_shcp_base():
|
|
d = m.rtrn_shmp_drvd()
|
|
i = m.pass_shcp_base(d) # load_impl Case 2a
|
|
assert i == 2 * 100 + 21
|
|
|
|
|
|
def test_rtrn_mptr_drvd_up_cast_pass_cptr_drvd():
|
|
b = m.rtrn_mptr_drvd_up_cast()
|
|
# the base return is down-cast immediately.
|
|
assert b.__class__.__name__ == "drvd"
|
|
i = m.pass_cptr_drvd(b)
|
|
assert i == 2 * 100 + 12
|
|
|
|
|
|
def test_rtrn_shmp_drvd_up_cast_pass_shcp_drvd():
|
|
b = m.rtrn_shmp_drvd_up_cast()
|
|
# the base return is down-cast immediately.
|
|
assert b.__class__.__name__ == "drvd"
|
|
i = m.pass_shcp_drvd(b)
|
|
assert i == 2 * 100 + 22
|
|
|
|
|
|
def test_rtrn_mptr_drvd2_pass_cptr_bases():
|
|
d = m.rtrn_mptr_drvd2()
|
|
i1 = m.pass_cptr_base1(d) # load_impl Case 2c
|
|
assert i1 == 3 * 110 + 4 * 120 + 21
|
|
i2 = m.pass_cptr_base2(d)
|
|
assert i2 == 3 * 110 + 4 * 120 + 22
|
|
|
|
|
|
def test_rtrn_mptr_drvd2_up_casts_pass_cptr_drvd2():
|
|
b1 = m.rtrn_mptr_drvd2_up_cast1()
|
|
assert b1.__class__.__name__ == "drvd2"
|
|
i1 = m.pass_cptr_drvd2(b1)
|
|
assert i1 == 3 * 110 + 4 * 120 + 23
|
|
b2 = m.rtrn_mptr_drvd2_up_cast2()
|
|
assert b2.__class__.__name__ == "drvd2"
|
|
i2 = m.pass_cptr_drvd2(b2)
|
|
assert i2 == 3 * 110 + 4 * 120 + 23
|
|
|
|
|
|
def test_python_drvd2():
|
|
class Drvd2(m.base1, m.base2):
|
|
def __init__(self):
|
|
m.base1.__init__(self)
|
|
m.base2.__init__(self)
|
|
|
|
d = Drvd2()
|
|
i1 = m.pass_cptr_base1(d) # load_impl Case 2b
|
|
assert i1 == 110 + 21
|
|
i2 = m.pass_cptr_base2(d)
|
|
assert i2 == 120 + 22
|