mirror of
https://github.com/pybind/pybind11.git
synced 2025-02-18 06:30: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).
120 lines
4.4 KiB
C++
120 lines
4.4 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
namespace pybind11_tests {
|
|
namespace {
|
|
|
|
const std::string fooNames[] = {"ShPtr_", "SmHld_"};
|
|
|
|
template <int SerNo>
|
|
struct Foo {
|
|
std::string history;
|
|
explicit Foo(const std::string &history_) : history(history_) {}
|
|
Foo(const Foo &other) : history(other.history + "_CpCtor") {}
|
|
Foo(Foo &&other) noexcept : history(other.history + "_MvCtor") {}
|
|
Foo &operator=(const Foo &other) {
|
|
history = other.history + "_OpEqLv";
|
|
return *this;
|
|
}
|
|
Foo &operator=(Foo &&other) noexcept {
|
|
history = other.history + "_OpEqRv";
|
|
return *this;
|
|
}
|
|
std::string get_history() const { return "Foo" + fooNames[SerNo] + history; }
|
|
};
|
|
|
|
using FooShPtr = Foo<0>;
|
|
using FooSmHld = Foo<1>;
|
|
|
|
struct Outer {
|
|
std::shared_ptr<FooShPtr> ShPtr;
|
|
std::shared_ptr<FooSmHld> SmHld;
|
|
Outer()
|
|
: ShPtr(std::make_shared<FooShPtr>("Outer")), SmHld(std::make_shared<FooSmHld>("Outer")) {}
|
|
std::shared_ptr<FooShPtr> getShPtr() const { return ShPtr; }
|
|
std::shared_ptr<FooSmHld> getSmHld() const { return SmHld; }
|
|
};
|
|
|
|
} // namespace
|
|
} // namespace pybind11_tests
|
|
|
|
PYBIND11_TYPE_CASTER_BASE_HOLDER(pybind11_tests::FooShPtr,
|
|
std::shared_ptr<pybind11_tests::FooShPtr>)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::FooSmHld)
|
|
|
|
namespace pybind11_tests {
|
|
|
|
TEST_SUBMODULE(class_sh_shared_ptr_copy_move, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
namespace py = pybind11;
|
|
|
|
py::class_<FooShPtr, std::shared_ptr<FooShPtr>>(m, "FooShPtr")
|
|
.def("get_history", &FooShPtr::get_history);
|
|
py::classh<FooSmHld>(m, "FooSmHld").def("get_history", &FooSmHld::get_history);
|
|
|
|
auto outer = py::class_<Outer>(m, "Outer").def(py::init());
|
|
# define MAKE_PROP(PropTyp) \
|
|
MAKE_PROP_FOO(ShPtr, PropTyp) \
|
|
MAKE_PROP_FOO(SmHld, PropTyp)
|
|
|
|
# define MAKE_PROP_FOO(FooTyp, PropTyp) \
|
|
.def_##PropTyp(#FooTyp "_" #PropTyp "_default", &Outer::FooTyp) \
|
|
.def_##PropTyp( \
|
|
#FooTyp "_" #PropTyp "_copy", &Outer::FooTyp, py::return_value_policy::copy) \
|
|
.def_##PropTyp( \
|
|
#FooTyp "_" #PropTyp "_move", &Outer::FooTyp, py::return_value_policy::move)
|
|
outer MAKE_PROP(readonly) MAKE_PROP(readwrite);
|
|
# undef MAKE_PROP_FOO
|
|
|
|
# define MAKE_PROP_FOO(FooTyp, PropTyp) \
|
|
.def_##PropTyp(#FooTyp "_property_" #PropTyp "_default", &Outer::FooTyp) \
|
|
.def_property_##PropTyp(#FooTyp "_property_" #PropTyp "_copy", \
|
|
&Outer::get##FooTyp, \
|
|
py::return_value_policy::copy) \
|
|
.def_property_##PropTyp(#FooTyp "_property_" #PropTyp "_move", \
|
|
&Outer::get##FooTyp, \
|
|
py::return_value_policy::move)
|
|
outer MAKE_PROP(readonly);
|
|
# undef MAKE_PROP_FOO
|
|
# undef MAKE_PROP
|
|
|
|
m.def("test_ShPtr_copy", []() {
|
|
auto o = std::make_shared<FooShPtr>("copy");
|
|
auto l = py::list();
|
|
l.append(o);
|
|
return l;
|
|
});
|
|
m.def("test_SmHld_copy", []() {
|
|
auto o = std::make_shared<FooSmHld>("copy");
|
|
auto l = py::list();
|
|
l.append(o);
|
|
return l;
|
|
});
|
|
|
|
m.def("test_ShPtr_move", []() {
|
|
auto o = std::make_shared<FooShPtr>("move");
|
|
auto l = py::list();
|
|
l.append(std::move(o));
|
|
return l;
|
|
});
|
|
m.def("test_SmHld_move", []() {
|
|
auto o = std::make_shared<FooSmHld>("move");
|
|
auto l = py::list();
|
|
l.append(std::move(o));
|
|
return l;
|
|
});
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|
|
|
|
} // namespace pybind11_tests
|