mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-29 08:32:02 +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).
99 lines
3.2 KiB
C++
99 lines
3.2 KiB
C++
#include <pybind11/smart_holder.h>
|
|
|
|
#include "pybind11_tests.h"
|
|
|
|
#include <memory>
|
|
|
|
namespace pybind11_tests {
|
|
namespace class_sh_trampoline_basic {
|
|
|
|
template <int SerNo> // Using int as a trick to easily generate a series of types.
|
|
struct Abase {
|
|
int val = 0;
|
|
virtual ~Abase() = default;
|
|
explicit Abase(int val_) : val{val_} {}
|
|
int Get() const { return val * 10 + 3; }
|
|
virtual int Add(int other_val) const = 0;
|
|
|
|
// Some compilers complain about implicitly defined versions of some of the following:
|
|
Abase(const Abase &) = default;
|
|
Abase(Abase &&) noexcept = default;
|
|
Abase &operator=(const Abase &) = default;
|
|
Abase &operator=(Abase &&) noexcept = default;
|
|
};
|
|
|
|
template <int SerNo>
|
|
struct AbaseAlias : Abase<SerNo> {
|
|
using Abase<SerNo>::Abase;
|
|
|
|
int Add(int other_val) const override {
|
|
PYBIND11_OVERRIDE_PURE(int, /* Return type */
|
|
Abase<SerNo>, /* Parent class */
|
|
Add, /* Name of function in C++ (must match Python name) */
|
|
other_val);
|
|
}
|
|
};
|
|
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
template <>
|
|
struct AbaseAlias<1> : Abase<1>, py::trampoline_self_life_support {
|
|
using Abase<1>::Abase;
|
|
|
|
int Add(int other_val) const override {
|
|
PYBIND11_OVERRIDE_PURE(int, /* Return type */
|
|
Abase<1>, /* Parent class */
|
|
Add, /* Name of function in C++ (must match Python name) */
|
|
other_val);
|
|
}
|
|
};
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
|
|
template <int SerNo>
|
|
int AddInCppRawPtr(const Abase<SerNo> *obj, int other_val) {
|
|
return obj->Add(other_val) * 10 + 7;
|
|
}
|
|
|
|
template <int SerNo>
|
|
int AddInCppSharedPtr(std::shared_ptr<Abase<SerNo>> obj, int other_val) {
|
|
return obj->Add(other_val) * 100 + 11;
|
|
}
|
|
|
|
template <int SerNo>
|
|
int AddInCppUniquePtr(std::unique_ptr<Abase<SerNo>> obj, int other_val) {
|
|
return obj->Add(other_val) * 100 + 13;
|
|
}
|
|
|
|
template <int SerNo>
|
|
void wrap(py::module_ m, const char *py_class_name) {
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
py::classh<Abase<SerNo>, AbaseAlias<SerNo>>(m, py_class_name)
|
|
.def(py::init<int>(), py::arg("val"))
|
|
.def("Get", &Abase<SerNo>::Get)
|
|
.def("Add", &Abase<SerNo>::Add, py::arg("other_val"));
|
|
|
|
m.def("AddInCppRawPtr", AddInCppRawPtr<SerNo>, py::arg("obj"), py::arg("other_val"));
|
|
m.def("AddInCppSharedPtr", AddInCppSharedPtr<SerNo>, py::arg("obj"), py::arg("other_val"));
|
|
m.def("AddInCppUniquePtr", AddInCppUniquePtr<SerNo>, py::arg("obj"), py::arg("other_val"));
|
|
#endif
|
|
}
|
|
|
|
} // namespace class_sh_trampoline_basic
|
|
} // namespace pybind11_tests
|
|
|
|
using namespace pybind11_tests::class_sh_trampoline_basic;
|
|
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Abase<0>)
|
|
PYBIND11_SMART_HOLDER_TYPE_CASTERS(Abase<1>)
|
|
|
|
TEST_SUBMODULE(class_sh_trampoline_basic, m) {
|
|
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
|
|
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
false;
|
|
#else
|
|
true;
|
|
|
|
wrap<0>(m, "Abase0");
|
|
wrap<1>(m, "Abase1");
|
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
}
|