Skip to content

Fixed issue on g++13 with nullptr dereference that cannot happen at r… #571

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
cliffburdick merged 1 commit into from
Jan 31, 2024
Merged

Fixed issue on g++13 with nullptr dereference that cannot happen at r… #571

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
36 changes: 24 additions & 12 deletions include/matx/core/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,6 +1452,16 @@ class tensor_t : public detail::tensor_impl_t<T,RANK,Desc> {
int d = 0;
bool def_stride = (strides[0] == -1);

int end_count = 0;
for (int i = 0; i < RANK; i++) {
if (ends[i] == matxDropDim) {
end_count++;
}
}

MATX_ASSERT_STR(((RANK - end_count) == N), matxInvalidSize,
"Number of matxDropDim specifiers must match the output rank");

#pragma unroll
for (int i = 0; i < RANK; i++) {
typename Desc::shape_type first = firsts[i] < 0 ? this->Size(i) + firsts[i] : firsts[i];
Expand All @@ -1474,20 +1484,22 @@ class tensor_t : public detail::tensor_impl_t<T,RANK,Desc> {
// offset by first
data += first * Stride(i);

if (end != matxDropDim) {
if (end == matxEnd) {
n[d] = this->Size(i) - first;
}
else {
n[d] = end - first;
}
if constexpr (N > 0) {
if (end != matxDropDim) {
if (end == matxEnd) {
n[d] = this->Size(i) - first;
}
else {
n[d] = end - first;
}

// New length is shorter if we have a non-1 stride
n[d] = static_cast<typename Desc::shape_type>(std::ceil(
static_cast<double>(n[d]) / static_cast<double>(stride_mult)));
// New length is shorter if we have a non-1 stride
n[d] = static_cast<typename Desc::shape_type>(std::ceil(
static_cast<double>(n[d]) / static_cast<double>(stride_mult)));

s[d] = Stride(i) * stride_mult;
d++;
s[d] = Stride(i) * stride_mult;
d++;
}
}
}

Expand Down