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/armnn/Graph.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/armnn/Graph.hpp')
-rw-r--r-- | src/armnn/Graph.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/armnn/Graph.hpp b/src/armnn/Graph.hpp index 63bc8d062c..00ab8deaa0 100644 --- a/src/armnn/Graph.hpp +++ b/src/armnn/Graph.hpp @@ -11,6 +11,7 @@ #include <armnn/TensorFwd.hpp> #include <armnn/NetworkFwd.hpp> #include <armnn/Exceptions.hpp> +#include <armnn/utility/Assert.hpp> #include <list> #include <map> @@ -18,7 +19,6 @@ #include <unordered_set> #include <vector> -#include <boost/assert.hpp> #include <boost/iterator/transform_iterator.hpp> namespace armnn @@ -115,8 +115,8 @@ public: otherLayer->Reparent(*this, m_Layers.end()); }); - BOOST_ASSERT(other.m_PosInGraphMap.empty()); - BOOST_ASSERT(other.m_Layers.empty()); + ARMNN_ASSERT(other.m_PosInGraphMap.empty()); + ARMNN_ASSERT(other.m_Layers.empty()); return *this; } @@ -298,7 +298,7 @@ private: const size_t numErased = graph.m_PosInGraphMap.erase(this); IgnoreUnused(numErased); - BOOST_ASSERT(numErased == 1); + ARMNN_ASSERT(numErased == 1); } protected: @@ -356,7 +356,7 @@ public: { const size_t numErased = m_Graph->m_InputIds.erase(GetBindingId()); IgnoreUnused(numErased); - BOOST_ASSERT(numErased == 1); + ARMNN_ASSERT(numErased == 1); } }; @@ -382,14 +382,14 @@ public: { const size_t numErased = m_Graph->m_OutputIds.erase(GetBindingId()); IgnoreUnused(numErased); - BOOST_ASSERT(numErased == 1); + ARMNN_ASSERT(numErased == 1); } }; inline Graph::Iterator Graph::GetPosInGraph(Layer& layer) { auto it = m_PosInGraphMap.find(&layer); - BOOST_ASSERT(it != m_PosInGraphMap.end()); + ARMNN_ASSERT(it != m_PosInGraphMap.end()); return it->second; } @@ -429,7 +429,7 @@ inline LayerT* Graph::InsertNewLayer(OutputSlot& insertAfter, Args&&... args) const Iterator pos = std::next(GetPosInGraph(owningLayer)); LayerT* const layer = new LayerInGraph<LayerT>(*this, pos, std::forward<Args>(args)...); - BOOST_ASSERT(layer->GetNumInputSlots() == 1); + ARMNN_ASSERT(layer->GetNumInputSlots() == 1); insertAfter.MoveAllConnections(layer->GetOutputSlot()); insertAfter.Connect(layer->GetInputSlot(0)); @@ -449,7 +449,7 @@ inline void Graph::EraseLayer(Iterator pos) template <typename LayerT> inline void Graph::EraseLayer(LayerT*& layer) { - BOOST_ASSERT(layer != nullptr); + ARMNN_ASSERT(layer != nullptr); EraseLayer(GetPosInGraph(*layer)); layer = nullptr; } |