mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-25 22:52:01 +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).
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
#include <pybind11/pybind11.h>
|
|
|
|
#include "number_bucket.h"
|
|
|
|
#include <cstddef>
|
|
#include <memory>
|
|
|
|
namespace hc { // holder comparison
|
|
|
|
using nb_up = pybind11_ubench::number_bucket<1>;
|
|
using nb_sp = pybind11_ubench::number_bucket<2>;
|
|
using nb_pu = pybind11_ubench::number_bucket<3>;
|
|
using nb_sh = pybind11_ubench::number_bucket<4>;
|
|
|
|
namespace py = pybind11;
|
|
|
|
template <typename WrappedType, typename HolderType>
|
|
void wrap_number_bucket(py::module m, const char *class_name) {
|
|
py::class_<WrappedType, HolderType>(m, class_name)
|
|
.def(py::init<std::size_t>(), py::arg("data_size") = 0)
|
|
.def("sum", &WrappedType::sum)
|
|
.def("add", &WrappedType::add, py::arg("other"));
|
|
}
|
|
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
|
|
template <typename T>
|
|
class padded_unique_ptr {
|
|
std::unique_ptr<T> ptr;
|
|
char padding[sizeof(py::smart_holder) - sizeof(std::unique_ptr<T>)];
|
|
|
|
public:
|
|
padded_unique_ptr(T *p) : ptr(p) {}
|
|
T *get() { return ptr.get(); }
|
|
};
|
|
|
|
static_assert(sizeof(padded_unique_ptr<nb_pu>) == sizeof(py::smart_holder),
|
|
"Unexpected sizeof mismatch.");
|
|
|
|
#endif
|
|
|
|
} // namespace hc
|
|
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
PYBIND11_DECLARE_HOLDER_TYPE(T, hc::padded_unique_ptr<T>);
|
|
#endif
|
|
|
|
PYBIND11_MODULE(pybind11_ubench_holder_comparison, m) {
|
|
using namespace hc;
|
|
wrap_number_bucket<nb_up, std::unique_ptr<nb_up>>(m, "number_bucket_up");
|
|
wrap_number_bucket<nb_sp, std::shared_ptr<nb_sp>>(m, "number_bucket_sp");
|
|
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
|
m.def("sizeof_smart_holder", []() { return sizeof(py::smart_holder); });
|
|
wrap_number_bucket<nb_pu, padded_unique_ptr<nb_pu>>(m, "number_bucket_pu");
|
|
wrap_number_bucket<nb_sh, py::smart_holder>(m, "number_bucket_sh");
|
|
#endif
|
|
}
|