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>

diff --git a/src/armnn/test/FloatingPointConverterTest.cpp b/src/armnn/test/FloatingPointConverterTest.cpp
index dabc1c1..d3474de 100644 (file)
--- 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 d324add..a6b8b7d 100644 (file)
--- 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

diff --git a/src/backends/reference/test/RefCreateWorkloadTests.cpp b/src/backends/reference/test/RefCreateWorkloadTests.cpp
index 437366a..9c08909 100644 (file)
--- a/src/backends/reference/test/RefCreateWorkloadTests.cpp
+++ b/src/backends/reference/test/RefCreateWorkloadTests.cpp
@@ -1113,7 +1113,7 @@ static void RefCreateQLstmWorkloadTest()
     BOOST_TEST((outputHandle->GetTensorInfo() == outputInfo));
 }
 
-BOOST_AUTO_TEST_CASE(CreateQLstmWorkloadTest)
+BOOST_AUTO_TEST_CASE(CreateQLstmWorkload)
 {
     RefCreateQLstmWorkloadTest<RefQLstmWorkload>();
 }