diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/packetmath.cpp | 18 | ||||
-rw-r--r-- | test/packetmath_test_shared.h | 25 |
2 files changed, 9 insertions, 34 deletions
diff --git a/test/packetmath.cpp b/test/packetmath.cpp index e69120a25..76ac47554 100644 --- a/test/packetmath.cpp +++ b/test/packetmath.cpp @@ -543,10 +543,10 @@ void packetmath_real() { CHECK_CWISE1_IF(PacketTraits::HasCos, std::cos, internal::pcos); CHECK_CWISE1_IF(PacketTraits::HasTan, std::tan, internal::ptan); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasRound, numext::round, internal::pround); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasCeil, numext::ceil, internal::pceil); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasFloor, numext::floor, internal::pfloor); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasRint, numext::rint, internal::print); + CHECK_CWISE1_IF(PacketTraits::HasRound, numext::round, internal::pround); + CHECK_CWISE1_IF(PacketTraits::HasCeil, numext::ceil, internal::pceil); + CHECK_CWISE1_IF(PacketTraits::HasFloor, numext::floor, internal::pfloor); + CHECK_CWISE1_IF(PacketTraits::HasRint, numext::rint, internal::print); // Rounding edge cases. if (PacketTraits::HasRound || PacketTraits::HasCeil || PacketTraits::HasFloor || PacketTraits::HasRint) { @@ -583,10 +583,10 @@ void packetmath_real() { for (size_t k=0; k<values.size(); ++k) { data1[0] = values[k]; - CHECK_CWISE1_EXACT_IF(PacketTraits::HasRound, numext::round, internal::pround); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasCeil, numext::ceil, internal::pceil); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasFloor, numext::floor, internal::pfloor); - CHECK_CWISE1_EXACT_IF(PacketTraits::HasRint, numext::rint, internal::print); + CHECK_CWISE1_IF(PacketTraits::HasRound, numext::round, internal::pround); + CHECK_CWISE1_IF(PacketTraits::HasCeil, numext::ceil, internal::pceil); + CHECK_CWISE1_IF(PacketTraits::HasFloor, numext::floor, internal::pfloor); + CHECK_CWISE1_IF(PacketTraits::HasRint, numext::rint, internal::print); } } @@ -644,7 +644,7 @@ void packetmath_real() { if (PacketTraits::HasExp) { data1[0] = Scalar(-1); // underflow to zero - data1[PacketSize] = Scalar(std::numeric_limits<Scalar>::min_exponent-55); + data1[PacketSize] = Scalar(std::numeric_limits<Scalar>::min_exponent-10); CHECK_CWISE2_IF(PacketTraits::HasExp, REF_LDEXP, internal::pldexp); // overflow to inf data1[PacketSize] = Scalar(std::numeric_limits<Scalar>::max_exponent+10); diff --git a/test/packetmath_test_shared.h b/test/packetmath_test_shared.h index 8fbe0d2f7..027715a89 100644 --- a/test/packetmath_test_shared.h +++ b/test/packetmath_test_shared.h @@ -108,23 +108,6 @@ template<typename Scalar> bool areApprox(const Scalar* a, const Scalar* b, int s return true; } -template<typename Scalar> bool areEqual(const Scalar* a, const Scalar* b, int size) -{ - for (int i=0; i<size; ++i) - { - if (a[i] != b[i]) - { - if((numext::isnan)(a[i]) && (numext::isnan)(b[i])) - { - continue; - } - std::cout << "ref: [" << Map<const Matrix<Scalar,1,Dynamic> >(a,size) << "]" << " != vec: [" << Map<const Matrix<Scalar,1,Dynamic> >(b,size) << "]\n"; - return false; - } - } - return true; -} - #define CHECK_CWISE1(REFOP, POP) { \ for (int i=0; i<PacketSize; ++i) \ ref[i] = REFOP(data1[i]); \ @@ -195,14 +178,6 @@ struct packet_helper<false,Packet> VERIFY(test::areApprox(ref, data2, PacketSize) && #POP); \ } -#define CHECK_CWISE1_EXACT_IF(COND, REFOP, POP) if(COND) { \ - test::packet_helper<COND,Packet> h; \ - for (int i=0; i<PacketSize; ++i) \ - ref[i] = Scalar(REFOP(data1[i])); \ - h.store(data2, POP(h.load(data1))); \ - VERIFY(test::areEqual(ref, data2, PacketSize) && #POP); \ -} - #define CHECK_CWISE2_IF(COND, REFOP, POP) if(COND) { \ test::packet_helper<COND,Packet> h; \ for (int i=0; i<PacketSize; ++i) \ |