10000 Average: debugging bug by tdegeus · Pull Request #2569 · xtensor-stack/xtensor · GitHub
[go: up one dir, main page]
Skip to content

Average: debugging bug #2569

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

Closed
wants to merge 2 commits into from
Closed

Average: debugging bug #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14dd778
average: using `XTENSOR_ASSERT_MSG` instead of `XTENSOR_THROW`
tdegeus Aug 19, 2022
9cdf2c9
average: adding test to find bug
tdegeus Aug 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
10000 Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions include/xtensor/xmath.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,21 +1975,13 @@ namespace detail {
auto ax = normalize_axis(e, axes);
if (weights.dimension() == 1)
{
if (weights.size() != e.shape()[ax[0]])
{
XTENSOR_THROW(std::runtime_error, "Weights need to have the same shape as expression at axes.");
}

XTENSOR_ASSERT_MSG(weights.size() == e.shape()[ax[0]], "Weights need to have the same shape as expression at axes.");
std::fill(broadcast_shape.begin(), broadcast_shape.end(), std::size_t(1));
broadcast_shape[ax[0]] = weights.size();
}
else
{
if (!same_shape(e.shape(), weights.shape()))
{
XTENSOR_THROW(std::runtime_error, "Weights with dim > 1 need to have the same shape as expression.");
}

XTENSOR_ASSERT_MSG(same_shape(e.shape(), weights.shape()), "Weights with dim > 1 need to have the same shape as expression.");
std::copy(e.shape().begin(), e.shape().end(), broadcast_shape.begin());
}

Expand Down
21 changes: 21 additions & 0 deletions test/test_xmath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,27 @@ namespace xt
EXPECT_EQ(xt::average(v, w, {0, 1})(), m);
}

TEST(xmath, average_random)
{
xt::xtensor<double,4> v = xt::random::rand<double>({4, 5, 6, 7});
xt::xtensor<double,4> w = xt::random::rand<double>({4, 5, 6, 7}) + 1.0;
xt::xtensor<double,2> r = xt::zeros<double>({6, 7});
xt::xtensor<double,2> n = xt::zeros<double>({6, 7});

for (size_t i = 0; i < v.shape(0); ++i) {
for (size_t j = 0; j < v.shape(1); ++j) {
for (size_t k = 0; k < v.shape(2); ++k) {
for (size_t l = 0; l < v.shape(3); ++l) {
r(k, l) += v(i, j, k, l) * w(i, j, k, l);
n(k, l) += w(i, j, k, l);
}
}
}
}

EXPECT_TRUE(xt::allclose(xt::average(v, w, {0, 1}), xt::eval(r / n)));
}

/************************
* Linear interpolation *
************************/
Expand Down
0