Skip to content

more fixes for {add,subt}(ToT,ToT) for the tensors with null elements #509

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
evaleev merged 1 commit into from
Mar 12, 2025
Merged

more fixes for {add,subt}(ToT,ToT) for the tensors with null elements #509

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
44 changes: 34 additions & 10 deletions src/TiledArray/tensor/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,7 @@ class Tensor {
auto volume = total_size();
for (decltype(volume) i = 0; i < volume; ++i) {
auto& el = *(data() + i);
if (!el.empty())
el = p(el, inner_perm);
if (!el.empty()) el = p(el, inner_perm);
}
}
}
Expand Down Expand Up @@ -1633,10 +1632,19 @@ class Tensor {
if (right.empty()) return *this;
return binary(
right,
[](const value_type& l, const value_t<Right>& r) -> decltype(auto) {
[](const value_type& l, const value_t<Right>& r) -> decltype(l + r) {
if constexpr (detail::is_tensor_v<value_type>) {
if (l.empty() && r.empty())
return value_type{};
if (l.empty()) {
if (r.empty())
return {};
else
return r;
} else {
if (r.empty())
return l;
else
return l + r;
}
}
return l + r;
});
Expand Down Expand Up @@ -1799,8 +1807,23 @@ class Tensor {
detail::tensors_have_equal_nested_rank_v<Tensor, Right>>>
Tensor subt(const Right& right) const {
return binary(
right, [](const value_type& l, const value_type& r) -> decltype(auto) {
return l - r;
right,
[](const value_type& l, const value_t<Right>& r) -> decltype(l - r) {
if constexpr (detail::is_tensor_v<value_type>) {
if (l.empty()) {
if (r.empty())
return {};
else
return -r;
} else {
if (r.empty())
return l;
else
return l - r;
}
} else {
return l - r;
}
});
}

Expand Down Expand Up @@ -1936,13 +1959,14 @@ class Tensor {
typename std::enable_if<detail::is_nested_tensor_v<Right>>::type* =
nullptr>
decltype(auto) mult(const Right& right) const {

auto mult_op =[](const value_type& l, const value_t<Right>& r) -> decltype(auto) {
auto mult_op = [](const value_type& l,
const value_t<Right>& r) -> decltype(auto) {
return l * r;
};

if (empty() || right.empty()) {
using res_t = decltype(std::declval<Tensor>().binary(std::declval<Right>(), mult_op));
using res_t = decltype(std::declval<Tensor>().binary(
std::declval<Right>(), mult_op));
return res_t{};
}

Expand Down