Skip to content

Fix TensorMap compound assignment operators #155

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
romeric merged 1 commit into from
Jan 1, 2022
Merged

Fix TensorMap compound assignment operators #155

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
8 changes: 4 additions & 4 deletions Fastor/tensor/TensorMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,19 @@ FASTOR_INLINE void assign(AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Re
trivial_assign(dst.self(),src);
}
template<typename Derived, size_t DIM, typename T, size_t ...Rest>
FASTOR_INLINE void assign_add(const AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
FASTOR_INLINE void assign_add(AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
trivial_assign_add(dst.self(),src);
}
template<typename Derived, size_t DIM, typename T, size_t ...Rest>
FASTOR_INLINE void assign_sub(const AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
FASTOR_INLINE void assign_sub(AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
trivial_assign_sub(dst.self(),src);
}
template<typename Derived, size_t DIM, typename T, size_t ...Rest>
FASTOR_INLINE void assign_mul(const AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
FASTOR_INLINE void assign_mul(AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
trivial_assign_mul(dst.self(),src);
}
template<typename Derived, size_t DIM, typename T, size_t ...Rest>
FASTOR_INLINE void assign_div(const AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
FASTOR_INLINE void assign_div(AbstractTensor<Derived,DIM> &dst, const TensorMap<T,Rest...> &src) {
trivial_assign_div(dst.self(),src);
}

Expand Down
30 changes: 30 additions & 0 deletions tests/test_tensormap/test_tensormap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,36 @@ void run() {
FASTOR_EXIT_ASSERT(std::abs(a.sum() - ma.sum()) < Tol);
}

// Compound assignment operators.
{
Tensor<T,4,5> src;
src = 3;
TensorMap<T,4,5> msrc(src);
Tensor<T,4,5> dst;
dst = 0;
Tensor<T,4,5> check;

// +=
check = 3;
dst += msrc;
FASTOR_EXIT_ASSERT(all_of(dst == check));

// *=
check = 9;
dst *= msrc;
FASTOR_EXIT_ASSERT(all_of(dst == check));

// -=
check = 6;
dst -= msrc;
FASTOR_EXIT_ASSERT(all_of(dst == check));

// /=
check = 2;
dst /= msrc;
FASTOR_EXIT_ASSERT(all_of(dst == check));
}

// Map a const array and copy-assign it to a non-const tensor.
{
const T data[] = {1, 2, 3};
Expand Down