commit ac2770a4bb6461bfbddec928bb6208f26f898f02
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Wed Apr 01 16:51:23 2020 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Mon Apr 06 09:06:01 2020 +0100
tree c72f67f648b7aca2f4bccf69b05d185bf5f9ccad
parent 7ee5d2c3b3cee5a924ed6347fef613ee07b5aca7

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

src/armnnUtils/TensorUtils.cpp

diff --git a/src/armnnUtils/TensorUtils.cpp b/src/armnnUtils/TensorUtils.cpp
index 535d68a..952c768 100644
--- a/src/armnnUtils/TensorUtils.cpp
+++ b/src/armnnUtils/TensorUtils.cpp
@@ -6,8 +6,8 @@
 #include <armnnUtils/TensorUtils.hpp>
 
 #include <armnn/backends/ITensorHandle.hpp>
+#include <armnn/utility/Assert.hpp>
 
-#include <boost/assert.hpp>
 #include <boost/format.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
@@ -114,8 +114,8 @@
                                    const unsigned int firstAxisInclusive,
                                    const unsigned int lastAxisExclusive)
 {
-    BOOST_ASSERT(firstAxisInclusive <= lastAxisExclusive);
-    BOOST_ASSERT(lastAxisExclusive <= shape.GetNumDimensions());
+    ARMNN_ASSERT(firstAxisInclusive <= lastAxisExclusive);
+    ARMNN_ASSERT(lastAxisExclusive <= shape.GetNumDimensions());
     unsigned int count = 1;
     for (unsigned int i = firstAxisInclusive; i < lastAxisExclusive; i++)
     {
@@ -126,9 +126,9 @@
 
 unsigned int GetUnsignedAxis(const unsigned int inputDimension, const int axis)
 {
-    BOOST_ASSERT_MSG(axis < boost::numeric_cast<int>(inputDimension),
+    ARMNN_ASSERT_MSG(axis < boost::numeric_cast<int>(inputDimension),
                      "Required axis index greater than number of dimensions.");
-    BOOST_ASSERT_MSG(axis >= -boost::numeric_cast<int>(inputDimension),
+    ARMNN_ASSERT_MSG(axis >= -boost::numeric_cast<int>(inputDimension),
                      "Required axis index lower than negative of the number of dimensions");
 
     unsigned int uAxis = axis < 0  ?
@@ -140,7 +140,7 @@
 unsigned int GetNumElementsAfter(const armnn::TensorShape& shape, unsigned int axis)
 {
     unsigned int numDim = shape.GetNumDimensions();
-    BOOST_ASSERT(axis <= numDim - 1);
+    ARMNN_ASSERT(axis <= numDim - 1);
     unsigned int count = 1;
     for (unsigned int i = axis; i < numDim; i++)
     {