diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2020-04-01 16:51:23 +0100 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2020-04-06 09:06:01 +0100 |
| commit | ac2770a4bb6461bfbddec928bb6208f26f898f02 (patch) | |
| tree | c72f67f648b7aca2f4bccf69b05d185bf5f9ccad /src/backends/reference/workloads/BaseIterator.hpp | |
| parent | 7ee5d2c3b3cee5a924ed6347fef613ee07b5aca7 (diff) | |
| download | armnn-ac2770a4bb6461bfbddec928bb6208f26f898f02.tar.gz | |
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
Diffstat (limited to 'src/backends/reference/workloads/BaseIterator.hpp')
| -rw-r--r-- | src/backends/reference/workloads/BaseIterator.hpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp index f43e8b67a9..be20644ab7 100644 --- a/src/backends/reference/workloads/BaseIterator.hpp +++ b/src/backends/reference/workloads/BaseIterator.hpp @@ -5,14 +5,13 @@ #pragma once -#include <armnn/utility/IgnoreUnused.hpp> #include <armnn/TypesUtils.hpp> +#include <armnn/utility/Assert.hpp> +#include <armnn/utility/IgnoreUnused.hpp> #include <armnnUtils/FloatingPointConverter.hpp> #include <ResolveType.hpp> -#include <boost/assert.hpp> - namespace armnn { @@ -78,28 +77,28 @@ public: TypedIterator& operator++() override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); ++m_Iterator; return *this; } TypedIterator& operator+=(const unsigned int increment) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator += increment; return *this; } TypedIterator& operator-=(const unsigned int increment) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator -= increment; return *this; } TypedIterator& operator[](const unsigned int index) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator = m_Start + index; return *this; } @@ -107,7 +106,7 @@ public: TypedIterator& SetIndex(unsigned int index, unsigned int axisIndex = 0) override { IgnoreUnused(axisIndex); - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator = m_Start + index; return *this; } @@ -504,7 +503,7 @@ public: // This should be called to set index for per-axis Encoder/Decoder PerAxisIterator& SetIndex(unsigned int index, unsigned int axisIndex) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator = m_Start + index; m_AxisIndex = axisIndex; return *this; @@ -519,7 +518,7 @@ public: PerAxisIterator& operator++() override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); ++m_Iterator; m_AxisIndex = static_cast<unsigned int>(*m_Iterator) % m_AxisFactor; return *this; @@ -527,7 +526,7 @@ public: PerAxisIterator& operator+=(const unsigned int increment) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator += increment; m_AxisIndex = static_cast<unsigned int>(*m_Iterator) % m_AxisFactor; return *this; @@ -535,7 +534,7 @@ public: PerAxisIterator& operator-=(const unsigned int decrement) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator -= decrement; m_AxisIndex = static_cast<unsigned int>(*m_Iterator) % m_AxisFactor; return *this; @@ -543,7 +542,7 @@ public: PerAxisIterator& operator[](const unsigned int index) override { - BOOST_ASSERT(m_Iterator); + ARMNN_ASSERT(m_Iterator); m_Iterator = m_Start + index; m_AxisIndex = static_cast<unsigned int>(*m_Iterator) % m_AxisFactor; return *this; |