mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 07:02:11 +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).
188 lines
7.7 KiB
C++
188 lines
7.7 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_factory_constructors {
|
|
|
|
template <int> // Using int as a trick to easily generate a series of types.
|
|
struct atyp { // Short for "any type".
|
|
std::string mtxt;
|
|
};
|
|
|
|
template <typename T>
|
|
std::string get_mtxt(const T &obj) {
|
|
return obj.mtxt;
|
|
}
|
|
|
|
using atyp_valu = atyp<0x0>;
|
|
using atyp_rref = atyp<0x1>;
|
|
using atyp_cref = atyp<0x2>;
|
|
using atyp_mref = atyp<0x3>;
|
|
using atyp_cptr = atyp<0x4>;
|
|
using atyp_mptr = atyp<0x5>;
|
|
using atyp_shmp = atyp<0x6>;
|
|
using atyp_shcp = atyp<0x7>;
|
|
using atyp_uqmp = atyp<0x8>;
|
|
using atyp_uqcp = atyp<0x9>;
|
|
using atyp_udmp = atyp<0xA>;
|
|
using atyp_udcp = atyp<0xB>;
|
|
|
|
// clang-format off
|
|
|
|
atyp_valu rtrn_valu() { atyp_valu obj{"Valu"}; return obj; }
|
|
atyp_rref&& rtrn_rref() { static atyp_rref obj; obj.mtxt = "Rref"; return std::move(obj); }
|
|
atyp_cref const& rtrn_cref() { static atyp_cref obj; obj.mtxt = "Cref"; return obj; }
|
|
atyp_mref& rtrn_mref() { static atyp_mref obj; obj.mtxt = "Mref"; return obj; }
|
|
atyp_cptr const* rtrn_cptr() { return new atyp_cptr{"Cptr"}; }
|
|
atyp_mptr* rtrn_mptr() { return new atyp_mptr{"Mptr"}; }
|
|
|
|
std::shared_ptr<atyp_shmp> rtrn_shmp() { return std::make_shared<atyp_shmp>(atyp_shmp{"Shmp"}); }
|
|
std::shared_ptr<atyp_shcp const> rtrn_shcp() { return std::shared_ptr<atyp_shcp const>(new atyp_shcp{"Shcp"}); }
|
|
|
|
std::unique_ptr<atyp_uqmp> rtrn_uqmp() { return std::unique_ptr<atyp_uqmp >(new atyp_uqmp{"Uqmp"}); }
|
|
std::unique_ptr<atyp_uqcp const> rtrn_uqcp() { return std::unique_ptr<atyp_uqcp const>(new atyp_uqcp{"Uqcp"}); }
|
|
|
|
struct sddm : std::default_delete<atyp_udmp > {};
|
|
struct sddc : std::default_delete<atyp_udcp const> {};
|
|
|
|
std::unique_ptr<atyp_udmp, sddm> rtrn_udmp() { return std::unique_ptr<atyp_udmp, sddm>(new atyp_udmp{"Udmp"}); }
|
|
std::unique_ptr<atyp_udcp const, sddc> rtrn_udcp() { return std::unique_ptr<atyp_udcp const, sddc>(new atyp_udcp{"Udcp"}); }
|
|
|
|
// clang-format on
|
|
|
|
// Minimalistic approach to achieve full coverage of construct() overloads for constructing
|
|
// smart_holder from unique_ptr and shared_ptr returns.
|
|
struct with_alias {
|
|
int val = 0;
|
|
virtual ~with_alias() = default;
|
|
// Some compilers complain about implicitly defined versions of some of the following:
|
|
with_alias() = default;
|
|
with_alias(const with_alias &) = default;
|
|
with_alias(with_alias &&) = default;
|
|
with_alias &operator=(const with_alias &) = default;
|
|
with_alias &operator=(with_alias &&) = default;
|
|
};
|
|
struct with_alias_alias : with_alias {};
|
|
struct sddwaa : std::default_delete<with_alias_alias> {};
|
|
|
|
} // namespace class_sh_factory_constructors
|
|
} // namespace pybind11_tests
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_valu)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_rref)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_cref)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_mref)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_cptr)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_mptr)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_shmp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_shcp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_uqmp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_uqcp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_udmp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::atyp_udcp)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_factory_constructors::with_alias)
|
|
|
|
TEST_SUBMODULE(class_sh_factory_constructors, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
using namespace pybind11_tests::class_sh_factory_constructors;
|
|
|
|
py::classh<atyp_valu>(m, "atyp_valu")
|
|
.def(py::init(&rtrn_valu))
|
|
.def("get_mtxt", get_mtxt<atyp_valu>);
|
|
|
|
py::classh<atyp_rref>(m, "atyp_rref")
|
|
.def(py::init(&rtrn_rref))
|
|
.def("get_mtxt", get_mtxt<atyp_rref>);
|
|
|
|
py::classh<atyp_cref>(m, "atyp_cref")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_cref))
|
|
.def("get_mtxt", get_mtxt<atyp_cref>);
|
|
|
|
py::classh<atyp_mref>(m, "atyp_mref")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_mref))
|
|
.def("get_mtxt", get_mtxt<atyp_mref>);
|
|
|
|
py::classh<atyp_cptr>(m, "atyp_cptr")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... must return a compatible ...
|
|
// .def(py::init(&rtrn_cptr))
|
|
.def("get_mtxt", get_mtxt<atyp_cptr>);
|
|
|
|
py::classh<atyp_mptr>(m, "atyp_mptr")
|
|
.def(py::init(&rtrn_mptr))
|
|
.def("get_mtxt", get_mtxt<atyp_mptr>);
|
|
|
|
py::classh<atyp_shmp>(m, "atyp_shmp")
|
|
.def(py::init(&rtrn_shmp))
|
|
.def("get_mtxt", get_mtxt<atyp_shmp>);
|
|
|
|
py::classh<atyp_shcp>(m, "atyp_shcp")
|
|
// py::class_<atyp_shcp, std::shared_ptr<atyp_shcp>>(m, "atyp_shcp")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_shcp))
|
|
.def("get_mtxt", get_mtxt<atyp_shcp>);
|
|
|
|
py::classh<atyp_uqmp>(m, "atyp_uqmp")
|
|
.def(py::init(&rtrn_uqmp))
|
|
.def("get_mtxt", get_mtxt<atyp_uqmp>);
|
|
|
|
py::classh<atyp_uqcp>(m, "atyp_uqcp")
|
|
// class_: ... cannot pass object of non-trivial type ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_uqcp))
|
|
.def("get_mtxt", get_mtxt<atyp_uqcp>);
|
|
|
|
py::classh<atyp_udmp>(m, "atyp_udmp")
|
|
.def(py::init(&rtrn_udmp))
|
|
.def("get_mtxt", get_mtxt<atyp_udmp>);
|
|
|
|
py::classh<atyp_udcp>(m, "atyp_udcp")
|
|
// py::class_<atyp_udcp, std::unique_ptr<atyp_udcp, sddc>>(m, "atyp_udcp")
|
|
// class_: ... must return a compatible ...
|
|
// classh: ... cannot pass object of non-trivial type ...
|
|
// .def(py::init(&rtrn_udcp))
|
|
.def("get_mtxt", get_mtxt<atyp_udcp>);
|
|
|
|
py::classh<with_alias, with_alias_alias>(m, "with_alias")
|
|
.def_readonly("val", &with_alias::val)
|
|
.def(py::init([](int i) {
|
|
auto p = std::unique_ptr<with_alias_alias, sddwaa>(new with_alias_alias);
|
|
p->val = i * 100;
|
|
return p;
|
|
}))
|
|
.def(py::init([](int i, int j) {
|
|
auto p = std::unique_ptr<with_alias_alias>(new with_alias_alias);
|
|
p->val = i * 100 + j * 10;
|
|
return p;
|
|
}))
|
|
.def(py::init([](int i, int j, int k) {
|
|
auto p = std::make_shared<with_alias_alias>();
|
|
p->val = i * 100 + j * 10 + k;
|
|
return p;
|
|
}))
|
|
.def(py::init(
|
|
[](int, int, int, int) { return std::unique_ptr<with_alias>(new with_alias); },
|
|
[](int, int, int, int) {
|
|
return std::unique_ptr<with_alias>(new with_alias); // Invalid alias factory.
|
|
}))
|
|
.def(py::init([](int, int, int, int, int) { return std::make_shared<with_alias>(); },
|
|
[](int, int, int, int, int) {
|
|
return std::make_shared<with_alias>(); // Invalid alias factory.
|
|
}));
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|