Skip to content

Fix squeeze offset for sliced views #2933

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

Open
Tyagiquamar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix squeeze offset for sliced views #2933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions include/xtensor/misc/xmanipulation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,13 @@ namespace xt
}
);

return strided_view(std::forward<E>(e), std::move(new_shape), std::move(new_strides), 0, e.layout());
return strided_view(
std::forward<E>(e),
std::move(new_shape),
std::move(new_strides),
detail::get_offset<XTENSOR_DEFAULT_LAYOUT>(e),
e.layout()
);
}

namespace detail
Expand All @@ -559,7 +565,13 @@ namespace xt
}
}

return strided_view(std::forward<E>(e), std::move(new_shape), std::move(new_strides), 0, e.layout());
return strided_view(
std::forward<E>(e),
std::move(new_shape),
std::move(new_strides),
detail::get_offset<XTENSOR_DEFAULT_LAYOUT>(e),
e.layout()
);
}

template <class E, class S>
Expand Down
13 changes: 13 additions & 0 deletions test/test_xmanipulation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,19 @@ namespace xt
EXPECT_EQ(sq3(2, 2, 0, 1, 0, 2), b(2, 2, 0, 0, 1, 0, 2));
}

TEST(xmanipulation, squeeze_offset)
{
xtensor<int, 2> a = {{1, 2, 3}};
xtensor<int, 1> expected = {2, 3};

EXPECT_EQ(squeeze(view(a, all(), range(1, 3))), expected);
EXPECT_EQ(squeeze(view(a, all(), range(1, 3)), 0, check_policy::full()), expected);

auto expression = view(a, all(), range(1, 3)) + 0;
EXPECT_EQ(squeeze(expression), expected);
EXPECT_EQ(squeeze(expression, 0, check_policy::full()), expected);
}

TEST(xmanipulation, expand_dims)
{
auto b = xt::xarray<double>::from_shape({3, 3});
Expand Down