Skip to content

chore: optimize dictionary access in strip_padding numpy #3994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Skylion007 merged 6 commits into from
Jun 7, 2022
Merged

chore: optimize dictionary access in strip_padding numpy #3994

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a87fec
emplace field descriptors
Skylion007 Jun 3, 2022
11f6875
reserve sufficient capacity
Skylion007 Jun 3, 2022
cee3ff0
remove std::move
Skylion007 Jun 3, 2022
f31c256
properly iterate through dict
Skylion007 Jun 3, 2022
271a1e0
make handle casting more explicit
Skylion007 Jun 6, 2022
9244958
Revert to old dict api
Skylion007 Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions include/pybind11/numpy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,10 +641,14 @@ class dtype : public object {
pybind11::str name;
object format;
pybind11::int_ offset;
field_descr(pybind11::str &&name, object &&format, pybind11::int_ &&offset)
: name{std::move(name)}, format{std::move(format)}, offset{std::move(offset)} {};
};
auto field_dict = attr("fields").cast<dict>();
std::vector<field_descr> field_descriptors;
field_descriptors.reserve(field_dict.size());

for (auto field : attr("fields").attr("items")()) {
for (auto field : field_dict.attr("items")()) {
auto spec = field.cast<tuple>();
auto name = spec[0].cast<pybind11::str>();
auto spec_fo = spec[1].cast<tuple>();
Expand All @@ -653,8 +657,8 @@ class dtype : public object {
if ((len(name) == 0u) && format.kind() == 'V') {
continue;
}
field_descriptors.push_back(
{(pybind11::str) name, format.strip_padding(format.itemsize()), offset});
field_descriptors.emplace_back(
std::move(name), format.strip_padding(format.itemsize()), std::move(offset));
}

std::sort(field_descriptors.begin(),
Expand Down