Skip to content

Fix errors which caused some unit tests failed to compile. #504

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
Oct 16, 2023
Merged

Fix errors which caused some unit tests failed to compile. #504

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
2 changes: 1 addition & 1 deletion include/matx/operators/r2c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace matx
}
constexpr __MATX_INLINE__ __MATX_HOST__ __MATX_DEVICE__ auto Size(int dim) const noexcept
{
if (dim == (uint32_t)(Rank() - 1)) {
if (dim == Rank() - 1) {
return orig_size_;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion include/matx/transforms/reduce.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ void __MATX_INLINE__ softmax_impl(OutType dest, const InType &in, PermDims dims,
for (int r = 0; r < InType::Rank(); r++) {
if (axis_ptr >= 0 && dims[axis_ptr] == r) {
clone_dims[r] = in.Size(r);
if (++axis_ptr == dims.size()) {
if (static_cast<decltype(dims.size())>(++axis_ptr) == dims.size()) {
axis_ptr = -1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/00_operators/OperatorTests.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3367,7 +3367,7 @@ TYPED_TEST(OperatorTestsFloatNonHalf, FftShiftWithTransform)
using inner_type = typename inner_op_type_t<TestType>::type;
using complex_type = detail::complex_from_scalar_t<typename inner_op_type_t<TestType>::type>;

const inner_type thresh = static_cast<inner_type>(1.0e-6);
[[maybe_unused]] const inner_type thresh = static_cast<inner_type>(1.0e-6);

// Verify that fftshift1D/ifftshift1D work with nested transforms.
// These tests are limited to complex-to-complex transforms where we have matched
Expand Down