Skip to content

Fix warnings from use of std::accumulate in xbuilder #2926

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
JohanMabille merged 2 commits into from
Jun 19, 2026
+14 −14
Merged

Fix warnings from use of std::accumulate in xbuilder #2926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fbc6de
Fix warnings from std::accumulate in xbuilder
bredej Jun 19, 2026
bfbf021
Use std::size_t in xbuilder
bredej Jun 19, 2026
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
28 changes: 14 additions & 14 deletions include/xtensor/generators/xbuilder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ namespace xt
{
// trim off extra indices if provided to match behavior of containers
auto dim_offset = std::distance(first, last) - std::get<0>(t).dimension();
size_t axis_dim = *(first + axis + dim_offset);
std::size_t axis_dim = *(first + axis + dim_offset);
auto match = [&](auto& arr)
{
if (axis_dim >= arr.shape()[axis])
Expand All @@ -512,16 +512,16 @@ namespace xt

auto get = [&](auto& arr)
{
size_t offset = 0;
const size_t end = arr.dimension();
for (size_t i = 0; i < end; i++)
std::size_t offset = 0;
const std::size_t end = arr.dimension();
for (std::size_t i = 0; i < end; i++)
{
const auto& shape = arr.shape();
const size_t stride = std::accumulate(
const std::size_t stride = std::accumulate(
shape.begin() + i + 1,
shape.end(),
1,
std::multiplies<size_t>()
size_t(1),
std::multiplies<std::size_t>()
);
if (i == axis)
{
Expand Down Expand Up @@ -563,21 +563,21 @@ namespace xt
{
auto get_item = [&](auto& arr)
{
size_t offset = 0;
const size_t end = arr.dimension();
size_t after_axis = 0;
for (size_t i = 0; i < end; i++)
std::size_t offset = 0;
const std::size_t end = arr.dimension();
std::size_t after_axis = 0;
for (std::size_t i = 0; i < end; i++)
{
if (i == axis)
{
after_axis = 1;
}
const auto& shape = arr.shape();
const size_t stride = std::accumulate(
const std::size_t stride = std::accumulate(
shape.begin() + static_cast<std::ptrdiff_t>(i) + 1,
shape.end(),
size_t(1),
std::multiplies<size_t>()
std::size_t(1),
std::multiplies<std::size_t>()
);
const auto len = (*(first + static_cast<std::ptrdiff_t>(i + after_axis)));
offset += len * stride;
Expand Down
Loading