Skip to content
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

optimized cast and conj op to return a tensor view when possible. #371

Merged
merged 1 commit into from
Feb 7, 2023
Merged

optimized cast and conj op to return a tensor view when possible. #371

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
25 changes: 15 additions & 10 deletions include/matx/operators/cast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ namespace matx
template <typename NewType, typename T>
auto __MATX_INLINE__ as_type(T t)
{
return detail::CastOp<T, NewType>(t);
if constexpr (std::is_same_v<NewType, typename T::scalar_type>) {
// optimized path when type is the same to avoid creating unecessary operators
return t;
} else {
return detail::CastOp<T, NewType>(t);
}
};


Expand All @@ -112,7 +117,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_int(T t)
{
return detail::CastOp<T, int>(t);
return as_type<int>(t);
};

/**
Expand All @@ -125,7 +130,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_float(T t)
{
return detail::CastOp<T, float>(t);
return as_type<float>(t);
};

/**
Expand All @@ -138,7 +143,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_double(T t)
{
return detail::CastOp<T, double>(t);
return as_type<double>(t);
};

/**
Expand All @@ -151,7 +156,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_uint32(T t)
{
return detail::CastOp<T, uint32_t>(t);
return as_type<uint32_t>(t);
};

/**
Expand All @@ -164,7 +169,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_int32(T t)
{
return detail::CastOp<T, int32_t>(t);
return as_type<int32_t>(t);
};

/**
Expand All @@ -177,7 +182,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_int16(T t)
{
return detail::CastOp<T, int16_t>(t);
return as_type<int16_t>(t);
};

/**
Expand All @@ -190,7 +195,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_uint16(T t)
{
return detail::CastOp<T, uint16_t>(t);
return as_type<uint16_t>(t);
};

/**
Expand All @@ -203,7 +208,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_int8(T t)
{
return detail::CastOp<T, int8_t>(t);
return as_type<int8_t>(t);
};

/**
Expand All @@ -216,7 +221,7 @@ namespace matx
template <typename T>
auto __MATX_INLINE__ as_uint8(T t)
{
return detail::CastOp<T, uint8_t>(t);
return as_type<uint8_t>(t);
};

} // end namespace matx
17 changes: 17 additions & 0 deletions include/matx/operators/unary_operators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,24 @@ namespace matx
DEFINE_UNARY_OP(log2, detail::Log2Op);
DEFINE_UNARY_OP(log, detail::LogOp);
DEFINE_UNARY_OP(loge, detail::LogOp);
#if 0
DEFINE_UNARY_OP(conj, detail::ConjOp);
#else
// implementing without a macro so we can optimize conj(real)
template <typename I1,
typename = typename std::enable_if_t<is_matx_op<I1>()>>
[[nodiscard]] __MATX_INLINE__ auto conj(I1 i1) {
using I1Type = extract_scalar_type_t<I1>;
if constexpr (is_complex_v<I1Type>) {
using Op = detail::ConjOp<I1Type>;
const typename detail::base_type<I1>::type &base = i1;
return detail::matxUnaryOp(base, Op());
} else {
// real type conj is a no-op so return original op.
return i1;
}
}
#endif
DEFINE_UNARY_OP(norm, detail::NormOp);
DEFINE_UNARY_OP(abs, detail::AbsOp);
DEFINE_UNARY_OP(sin, detail::SinOp);
Expand Down