Skip to content

Commit d28620b

Browse files
committed
gcc 8.3.1 changes.
1 parent f61c7a0 commit d28620b

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

unitTests/testTensorOpsCommon.hpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ randomValue( T const maxVal, std::mt19937_64 & gen )
9090
{ PORTABLE_EXPECT_EQ( A[ _i ], RESULT[ _i ] ); } \
9191
} while ( false )
9292

93+
#define CHECK_NEAR_1D( N, A, RESULT, EPSILON ) \
94+
tensorOps::internal::checkSizes< N >( A ); \
95+
tensorOps::internal::checkSizes< N >( RESULT ); \
96+
do \
97+
{ \
98+
for( std::ptrdiff_t _i = 0; _i < N; ++_i ) \
99+
{ \
100+
if( std::is_integral< std::remove_reference_t< decltype( A[ _i ] ) > >::value ) \
101+
{ PORTABLE_EXPECT_EQ( A[ _i ], RESULT[ _i ] ); } \
102+
else \
103+
{ PORTABLE_EXPECT_NEAR( A[ _i ], RESULT[ _i ], EPSILON ); } \
104+
} \
105+
} while ( false )
106+
93107

94108
#define CHECK_EQUALITY_2D( N, M, A, RESULT ) \
95109
tensorOps::internal::checkSizes< N, M >( A ); \

unitTests/testTensorOpsOneSize.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,12 @@ class OneSizeTest : public ::testing::Test
372372
T const ( &vectorB_local )[ N ] = m_vectorB_local;
373373

374374
std::ptrdiff_t const aSeed = m_seedVectorA;
375-
376-
forall< POLICY >( 1, [vectorA_IJ, vectorA_JI, vectorB_IJ, vectorB_JI, vectorB_local, aSeed] LVARRAY_HOST_DEVICE ( int )
375+
T const epsilon = NumericLimitsNC< T >{}.epsilon;
376+
forall< POLICY >( 1, [vectorA_IJ, vectorA_JI, vectorB_IJ, vectorB_JI, vectorB_local, aSeed, epsilon] LVARRAY_HOST_DEVICE ( int )
377377
{
378378
#define _TEST( a, b ) \
379379
tensorOps::scaledAdd< N >( a, b, scale ); \
380-
CHECK_EQUALITY_1D( N, a, result ); \
380+
CHECK_NEAR_1D( N, a, result, result[ N - 1 ] * epsilon ); \
381381
fill( a, aSeed )
382382

383383
#define _TEST_PERMS( a, b0, b1, b2 ) \

0 commit comments

Comments
 (0)