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

Jump to bottom

Arith: Correct type conversions for vector/scalar binary operations #181

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Arith: Correct type conversions for vector/scalar binary operations #181

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
158 changes: 102 additions & 56 deletions Arith/src/vect.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ construct_array(const F &f) {
// arithmetic operations, which is most useful for multi-dimensional
// array indices.

template <typename T, int D> struct vect;

template <typename T> struct is_vect : std::false_type {};
template <typename T, int D> struct is_vect<vect<T, D> > : std::true_type {};
template <typename T> constexpr bool is_vect_v = is_vect<T>::value;

template <typename T, int D> struct vect {
array<T, D> elts;

Expand Down Expand Up @@ -322,112 +328,152 @@ template <typename T, int D> struct vect {
y);
}

friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator+(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() + std::declval<T>()), D>
operator+(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a + b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator-(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() - std::declval<T>()), D>
operator-(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a - b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator*(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() - std::declval<T>()), D>
operator*(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a * b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator/(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() / std::declval<T>()), D>
operator/(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a / b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator%(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() % std::declval<T>()), D>
operator%(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a % b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
div_floor(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(div_floor(std::declval<U>(), std::declval<T>())), D>
div_floor(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return div_floor(a, b); }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
mod_floor(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(mod_floor(std::declval<U>(), std::declval<T>())), D>
mod_floor(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return mod_floor(a, b); }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator&(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() & std::declval<T>()), D>
operator&(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a & b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator|(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() | std::declval<T>()), D>
operator|(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a | b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator^(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() ^ std::declval<T>()), D>
operator^(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a ^ b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator<<(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() << std::declval<T>()), D>
operator<<(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a << b; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator>>(const T &a, const vect &x) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<U>() >> std::declval<T>()), D>
operator>>(const U &a, const vect &x) {
return fmap([&](const T &b) ARITH_INLINE { return a >> b; }, x);
}

friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator+(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() + std::declval<U>()), D>
operator+(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b + a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator-(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() - std::declval<U>()), D>
operator-(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b - a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator*(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() * std::declval<U>()), D>
operator*(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b * a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator/(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() / std::declval<U>()), D>
operator/(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b / a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator%(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() % std::declval<U>()), D>
operator%(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b % a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
div_floor(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(div_floor(std::declval<T>(), std::declval<U>())), D>
div_floor(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return div_floor(b, a); }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
mod_floor(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(mod_floor(std::declval<T>(), std::declval<U>())), D>
mod_floor(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return mod_floor(b, a); }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator&(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() & std::declval<U>()), D>
operator&(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b & a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator|(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() | std::declval<U>()), D>
operator|(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b | a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator^(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() ^ std::declval<U>()), D>
operator^(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b ^ a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator<<(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() << std::declval<U>()), D>
operator<<(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b << a; }, x);
}
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator>>(const vect &x, const T &a) {
template <typename U, std::enable_if_t<!is_vect_v<U> > * = nullptr>
friend constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST
vect<decltype(std::declval<T>() >> std::declval<U>()), D>
operator>>(const vect &x, const U &a) {
return fmap([&](const T &b) ARITH_INLINE { return b >> a; }, x);
}

constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator+=(const vect &x) {
return *this = *this + x;
}
constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator-=(const vect &x) {
return *this = *this - x;
}
template <typename U>
constexpr ARITH_INLINE ARITH_DEVICE ARITH_HOST vect
operator+=(const vect<U, D> &x) {
Expand Down