IVGCVSW-4485 Remove Boost assert

 * Change boost assert to armnn assert
 * Change include file to armnn assert
 * Fix ARMNN_ASSERT_MSG issue with multiple conditions
 * Change BOOST_ASSERT to BOOST_TEST where appropriate
 * Remove unused include statements

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff

1 files changed, 9 insertions, 9 deletions

diff --git a/src/armnnUtils/FloatingPointConverter.cpp b/src/armnnUtils/FloatingPointConverter.cpp
index 2216824205..5d89a25cd5 100644
--- a/src/armnnUtils/FloatingPointConverter.cpp
+++ b/src/armnnUtils/FloatingPointConverter.cpp
@@ -8,7 +8,7 @@
 #include "BFloat16.hpp"
 #include "Half.hpp"
 
-#include <boost/assert.hpp>
+#include <armnn/utility/Assert.hpp>
 
 namespace armnnUtils
 {
@@ -17,8 +17,8 @@ void FloatingPointConverter::ConvertFloat32To16(const float* srcFloat32Buffer,
                                                 size_t numElements,
                                                 void* dstFloat16Buffer)
 {
-    BOOST_ASSERT(srcFloat32Buffer != nullptr);
-    BOOST_ASSERT(dstFloat16Buffer != nullptr);
+    ARMNN_ASSERT(srcFloat32Buffer != nullptr);
+    ARMNN_ASSERT(dstFloat16Buffer != nullptr);
 
     armnn::Half* pHalf = reinterpret_cast<armnn::Half*>(dstFloat16Buffer);
 
@@ -32,8 +32,8 @@ void FloatingPointConverter::ConvertFloat16To32(const void* srcFloat16Buffer,
                                                 size_t numElements,
                                                 float* dstFloat32Buffer)
 {
-    BOOST_ASSERT(srcFloat16Buffer != nullptr);
-    BOOST_ASSERT(dstFloat32Buffer != nullptr);
+    ARMNN_ASSERT(srcFloat16Buffer != nullptr);
+    ARMNN_ASSERT(dstFloat32Buffer != nullptr);
 
     const armnn::Half* pHalf = reinterpret_cast<const armnn::Half*>(srcFloat16Buffer);
 
@@ -47,8 +47,8 @@ void FloatingPointConverter::ConvertFloat32ToBFloat16(const float* srcFloat32Buf
                                                       size_t numElements,
                                                       void* dstBFloat16Buffer)
 {
-    BOOST_ASSERT(srcFloat32Buffer != nullptr);
-    BOOST_ASSERT(dstBFloat16Buffer != nullptr);
+    ARMNN_ASSERT(srcFloat32Buffer != nullptr);
+    ARMNN_ASSERT(dstBFloat16Buffer != nullptr);
 
     armnn::BFloat16* bf16 = reinterpret_cast<armnn::BFloat16*>(dstBFloat16Buffer);
 
@@ -62,8 +62,8 @@ void FloatingPointConverter::ConvertBFloat16ToFloat32(const void* srcBFloat16Buf
                                                       size_t numElements,
                                                       float* dstFloat32Buffer)
 {
-    BOOST_ASSERT(srcBFloat16Buffer != nullptr);
-    BOOST_ASSERT(dstFloat32Buffer != nullptr);
+    ARMNN_ASSERT(srcBFloat16Buffer != nullptr);
+    ARMNN_ASSERT(dstFloat32Buffer != nullptr);
 
     const armnn::BFloat16* bf16 = reinterpret_cast<const armnn::BFloat16*>(srcBFloat16Buffer);