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).
47 lines
1.2 KiB
Python
47 lines
1.2 KiB
Python
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from pybind11_tests import class_sh_shared_ptr_copy_move 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_shptr_copy():
|
|
txt = m.test_ShPtr_copy()[0].get_history()
|
|
assert txt == "FooShPtr_copy"
|
|
|
|
|
|
def test_smhld_copy():
|
|
txt = m.test_SmHld_copy()[0].get_history()
|
|
assert txt == "FooSmHld_copy"
|
|
|
|
|
|
def test_shptr_move():
|
|
txt = m.test_ShPtr_move()[0].get_history()
|
|
assert txt == "FooShPtr_move"
|
|
|
|
|
|
def test_smhld_move():
|
|
txt = m.test_SmHld_move()[0].get_history()
|
|
assert txt == "FooSmHld_move"
|
|
|
|
|
|
def _check_property(foo_typ, prop_typ, policy):
|
|
o = m.Outer()
|
|
name = f"{foo_typ}_{prop_typ}_{policy}"
|
|
history = f"Foo{foo_typ}_Outer"
|
|
f = getattr(o, name)
|
|
assert f.get_history() == history
|
|
# and try again to check that o did not get changed
|
|
f = getattr(o, name)
|
|
assert f.get_history() == history
|
|
|
|
|
|
def test_properties():
|
|
for prop_typ in ("readonly", "readwrite", "property_readonly"):
|
|
for foo_typ in ("ShPtr", "SmHld"):
|
|
for policy in ("default", "copy", "move"):
|
|
_check_property(foo_typ, prop_typ, policy)
|