diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-05-19 16:31:10 +0100 |
|---|---|---|
| committer | Rob Hughes <robert.hughes@arm.com> | 2020-05-22 10:12:15 +0000 |
| commit | 985ef1f2baf052a4d845b4fc7b6019ee7cd5e846 (patch) | |
| tree | eb72aee13fc1755c80d0f20ec78f3609c5adafc4 /src/armnn | |
| parent | b5ab1bc890c9b3012181cb1133fcf082be5f91e5 (diff) | |
| download | armnn-985ef1f2baf052a4d845b4fc7b6019ee7cd5e846.tar.gz | |
Fix some build errors spotted on Windows:
* Use exact floating point constants for min/max values
* Rename test case so it doesn't collide with a function name
Change-Id: Icf03cfd8fedd505d02cd7f0a150502557939b903
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/test/FloatingPointConverterTest.cpp | 4 | ||||
| -rw-r--r-- | src/armnn/test/UtilsTests.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/armnn/test/FloatingPointConverterTest.cpp b/src/armnn/test/FloatingPointConverterTest.cpp index dabc1c16b3..d3474de831 100644 --- a/src/armnn/test/FloatingPointConverterTest.cpp +++ b/src/armnn/test/FloatingPointConverterTest.cpp @@ -69,8 +69,8 @@ BOOST_AUTO_TEST_CASE(TestConvertFloat32ToBFloat16) -1.1800863E-38f,// 0x80808001 round up 4.843037E-35f, // 0x0680C000 round up 3.9999998f, // 0x407FFFFF round up - 3.4028235E38f, // 0x7F7FFFFF max positive value - -3.4028235E38f, // 0xFF7FFFFF max negative value + std::numeric_limits<float>::max(), // 0x7F7FFFFF max positive value + std::numeric_limits<float>::lowest(), // 0xFF7FFFFF max negative value 1.1754942E-38f, // 0x007FFFFF min positive value -1.1754942E-38f // 0x807FFFFF min negative value }; diff --git a/src/armnn/test/UtilsTests.cpp b/src/armnn/test/UtilsTests.cpp index d324add14a..a6b8b7d7fd 100644 --- a/src/armnn/test/UtilsTests.cpp +++ b/src/armnn/test/UtilsTests.cpp @@ -139,10 +139,10 @@ BOOST_AUTO_TEST_CASE(Float32ToBFloat16Test) armnn::BFloat16 roundUp1 = armnn::BFloat16::Float32ToBFloat16(4.843037E-35f); // 0x0680C000 BOOST_CHECK_EQUAL(roundUp1.Val(), 0x0681); // Max positive value -> infinity - armnn::BFloat16 maxPositive = armnn::BFloat16::Float32ToBFloat16(3.4028235E38f); // 0x7F7FFFFF + armnn::BFloat16 maxPositive = armnn::BFloat16::Float32ToBFloat16(std::numeric_limits<float>::max()); // 0x7F7FFFFF BOOST_CHECK_EQUAL(maxPositive, armnn::BFloat16::Inf()); // Max negative value -> -infinity - armnn::BFloat16 maxNeg = armnn::BFloat16::Float32ToBFloat16(-3.4028235E38f); // 0xFF7FFFFF + armnn::BFloat16 maxNeg = armnn::BFloat16::Float32ToBFloat16(std::numeric_limits<float>::lowest()); // 0xFF7FFFFF BOOST_CHECK_EQUAL(maxNeg.Val(), 0xFF80); // Min positive value armnn::BFloat16 minPositive = armnn::BFloat16::Float32ToBFloat16(1.1754942E-38f); // 0x007FFFFF |