devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tensor casts for large packets and casts to/from std::complex

Browse Source 
The original tensor casts were only defined for
`SrcCoeffRatio`:`TgtCoeffRatio` 1:1, 1:2, 2:1, 4:1. Here we add the
missing 1:N and 8:1.

We also add casting `Eigen::half` to/from `std::complex<T>`, which
was missing to make it consistent with `Eigen:bfloat16`, and
generalize the overload to work for any complex type.

Tests were added to `basicstuff`, `packetmath`, and
`cxx11_tensor_casts` to test all cast configurations.
This commit is contained in:
Antonio Sanchez
2020-06-25 14:31:16 -07:00
committed by Antonio Sánchez
parent 145e51516f
commit 9cb8771e9c
7 changed files with 388 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
unsupported/test/cxx11_tensor_casts.cpp
View File

@@ -8,6 +8,7 @@
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "main.h"
#include "random_without_cast_overflow.h"
#include <Eigen/CXX11/Tensor>
@@ -104,12 +105,82 @@ static void test_small_to_big_type_cast()
}
}
template <typename FromType, typename ToType>
static void test_type_cast() {
Tensor<FromType, 2> ftensor(100, 200);
// Generate random values for a valid cast.
for (int i = 0; i < 100; ++i) {
for (int j = 0; j < 200; ++j) {
ftensor(i, j) = internal::random_without_cast_overflow<FromType,ToType>::value();
}
}
Tensor<ToType, 2> ttensor(100, 200);
ttensor = ftensor.template cast<ToType>();
for (int i = 0; i < 100; ++i) {
for (int j = 0; j < 200; ++j) {
const ToType ref = internal::cast<FromType,ToType>(ftensor(i, j));
VERIFY_IS_APPROX(ttensor(i, j), ref);
}
}
}
template<typename Scalar, typename EnableIf = void>
struct test_cast_runner {
static void run() {
test_type_cast<Scalar, bool>();
test_type_cast<Scalar, int8_t>();
test_type_cast<Scalar, int16_t>();
test_type_cast<Scalar, int32_t>();
test_type_cast<Scalar, int64_t>();
test_type_cast<Scalar, uint8_t>();
test_type_cast<Scalar, uint16_t>();
test_type_cast<Scalar, uint32_t>();
test_type_cast<Scalar, uint64_t>();
test_type_cast<Scalar, half>();
test_type_cast<Scalar, bfloat16>();
test_type_cast<Scalar, float>();
test_type_cast<Scalar, double>();
test_type_cast<Scalar, std::complex<float>>();
test_type_cast<Scalar, std::complex<double>>();
}
};
// Only certain types allow cast from std::complex<>.
template<typename Scalar>
struct test_cast_runner<Scalar, typename internal::enable_if<NumTraits<Scalar>::IsComplex>::type> {
static void run() {
test_type_cast<Scalar, half>();
test_type_cast<Scalar, bfloat16>();
test_type_cast<Scalar, std::complex<float>>();
test_type_cast<Scalar, std::complex<double>>();
}
};
EIGEN_DECLARE_TEST(cxx11_tensor_casts)
{
CALL_SUBTEST(test_simple_cast());
CALL_SUBTEST(test_vectorized_cast());
CALL_SUBTEST(test_float_to_int_cast());
CALL_SUBTEST(test_big_to_small_type_cast());
CALL_SUBTEST(test_small_to_big_type_cast());
CALL_SUBTEST(test_simple_cast());
CALL_SUBTEST(test_vectorized_cast());
CALL_SUBTEST(test_float_to_int_cast());
CALL_SUBTEST(test_big_to_small_type_cast());
CALL_SUBTEST(test_small_to_big_type_cast());
CALL_SUBTEST(test_cast_runner<bool>::run());
CALL_SUBTEST(test_cast_runner<int8_t>::run());
CALL_SUBTEST(test_cast_runner<int16_t>::run());
CALL_SUBTEST(test_cast_runner<int32_t>::run());
CALL_SUBTEST(test_cast_runner<int64_t>::run());
CALL_SUBTEST(test_cast_runner<uint8_t>::run());
CALL_SUBTEST(test_cast_runner<uint16_t>::run());
CALL_SUBTEST(test_cast_runner<uint32_t>::run());
CALL_SUBTEST(test_cast_runner<uint64_t>::run());
CALL_SUBTEST(test_cast_runner<half>::run());
CALL_SUBTEST(test_cast_runner<bfloat16>::run());
CALL_SUBTEST(test_cast_runner<float>::run());
CALL_SUBTEST(test_cast_runner<double>::run());
CALL_SUBTEST(test_cast_runner<std::complex<float>>::run());
CALL_SUBTEST(test_cast_runner<std::complex<double>>::run());
}