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/armnnTfLiteParser/test | |
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/armnnTfLiteParser/test')
-rw-r--r-- | src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp | 6 | ||||
-rw-r--r-- | src/armnnTfLiteParser/test/Unsupported.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index 797e11e403..56811b5b6d 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -11,6 +11,7 @@ #include <armnn/IRuntime.hpp> #include <armnn/TypesUtils.hpp> #include <armnn/BackendRegistry.hpp> +#include <armnn/utility/Assert.hpp> #include <armnnTfLiteParser/ITfLiteParser.hpp> @@ -19,7 +20,6 @@ #include <test/TensorHelpers.hpp> #include <boost/filesystem.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> #include "flatbuffers/idl.h" @@ -107,10 +107,10 @@ struct ParserFlatbuffersFixture flatbuffers::Parser parser; bool ok = parser.Parse(schemafile.c_str()); - BOOST_ASSERT_MSG(ok, "Failed to parse schema file"); + ARMNN_ASSERT_MSG(ok, "Failed to parse schema file"); ok &= parser.Parse(m_JsonString.c_str()); - BOOST_ASSERT_MSG(ok, "Failed to parse json input"); + ARMNN_ASSERT_MSG(ok, "Failed to parse json input"); if (!ok) { diff --git a/src/armnnTfLiteParser/test/Unsupported.cpp b/src/armnnTfLiteParser/test/Unsupported.cpp index 39dee679fd..21392ace02 100644 --- a/src/armnnTfLiteParser/test/Unsupported.cpp +++ b/src/armnnTfLiteParser/test/Unsupported.cpp @@ -7,10 +7,10 @@ #include "../TfLiteParser.hpp" #include <armnn/LayerVisitorBase.hpp> +#include <armnn/utility/Assert.hpp> #include <layers/StandInLayer.hpp> -#include <boost/assert.hpp> #include <boost/polymorphic_cast.hpp> #include <boost/test/unit_test.hpp> @@ -78,10 +78,10 @@ public: , m_StandInLayerVerifier(inputInfos, outputInfos) { const unsigned int numInputs = boost::numeric_cast<unsigned int>(inputInfos.size()); - BOOST_ASSERT(numInputs > 0); + ARMNN_ASSERT(numInputs > 0); const unsigned int numOutputs = boost::numeric_cast<unsigned int>(outputInfos.size()); - BOOST_ASSERT(numOutputs > 0); + ARMNN_ASSERT(numOutputs > 0); m_JsonString = R"( { |