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/armnnUtils | |
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/armnnUtils')
-rw-r--r-- | src/armnnUtils/DotSerializer.cpp | 1 | ||||
-rw-r--r-- | src/armnnUtils/FloatingPointConverter.cpp | 18 | ||||
-rw-r--r-- | src/armnnUtils/GraphTopologicalSort.hpp | 1 | ||||
-rw-r--r-- | src/armnnUtils/ModelAccuracyChecker.cpp | 2 | ||||
-rw-r--r-- | src/armnnUtils/ModelAccuracyChecker.hpp | 2 | ||||
-rw-r--r-- | src/armnnUtils/TensorUtils.cpp | 12 | ||||
-rw-r--r-- | src/armnnUtils/test/ParserHelperTest.cpp | 28 | ||||
-rw-r--r-- | src/armnnUtils/test/PrototxtConversionsTest.cpp | 30 |
8 files changed, 46 insertions, 48 deletions
diff --git a/src/armnnUtils/DotSerializer.cpp b/src/armnnUtils/DotSerializer.cpp index 7416ff6bdf..80043a9f90 100644 --- a/src/armnnUtils/DotSerializer.cpp +++ b/src/armnnUtils/DotSerializer.cpp @@ -5,7 +5,6 @@ #include "DotSerializer.hpp" -#include <boost/assert.hpp> #include <boost/algorithm/string/replace.hpp> #include <sstream> #include <cstring> 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); diff --git a/src/armnnUtils/GraphTopologicalSort.hpp b/src/armnnUtils/GraphTopologicalSort.hpp index 11314590a0..f3c4b191f8 100644 --- a/src/armnnUtils/GraphTopologicalSort.hpp +++ b/src/armnnUtils/GraphTopologicalSort.hpp @@ -5,7 +5,6 @@ #pragma once #include <armnn/Optional.hpp> -#include <boost/assert.hpp> #include <functional> #include <map> diff --git a/src/armnnUtils/ModelAccuracyChecker.cpp b/src/armnnUtils/ModelAccuracyChecker.cpp index 818cb17a65..d197dc86ba 100644 --- a/src/armnnUtils/ModelAccuracyChecker.cpp +++ b/src/armnnUtils/ModelAccuracyChecker.cpp @@ -64,7 +64,7 @@ std::vector<std::string> // Remove any preceding and trailing character specified in the characterSet. std::string Strip(const std::string& originalString, const std::string& characterSet) { - BOOST_ASSERT(!characterSet.empty()); + ARMNN_ASSERT(!characterSet.empty()); const std::size_t firstFound = originalString.find_first_not_of(characterSet); const std::size_t lastFound = originalString.find_last_not_of(characterSet); // Return empty if the originalString is empty or the originalString contains only to-be-striped characters diff --git a/src/armnnUtils/ModelAccuracyChecker.hpp b/src/armnnUtils/ModelAccuracyChecker.hpp index c4dd4f1b05..6595a52a98 100644 --- a/src/armnnUtils/ModelAccuracyChecker.hpp +++ b/src/armnnUtils/ModelAccuracyChecker.hpp @@ -7,7 +7,7 @@ #include <algorithm> #include <armnn/Types.hpp> -#include <boost/assert.hpp> +#include <armnn/utility/Assert.hpp> #include <boost/variant/apply_visitor.hpp> #include <cstddef> #include <functional> diff --git a/src/armnnUtils/TensorUtils.cpp b/src/armnnUtils/TensorUtils.cpp index 535d68adbe..952c76885a 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 @@ unsigned int GetNumElementsBetween(const TensorShape& shape, 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 GetNumElementsBetween(const TensorShape& shape, 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 GetUnsignedAxis(const unsigned int inputDimension, const int axis) 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++) { diff --git a/src/armnnUtils/test/ParserHelperTest.cpp b/src/armnnUtils/test/ParserHelperTest.cpp index dc37450ac1..dbf0673bf5 100644 --- a/src/armnnUtils/test/ParserHelperTest.cpp +++ b/src/armnnUtils/test/ParserHelperTest.cpp @@ -29,8 +29,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData1, keepDims, outputTensorInfo1); - BOOST_ASSERT(outputTensorInfo1.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo1.GetShape()[0] == 1); + BOOST_TEST(outputTensorInfo1.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo1.GetShape()[0] == 1); // Reducing dimension 0 results in a 3x4 size tensor (one dimension) std::set<unsigned int> axisData2 = { 0 }; @@ -38,8 +38,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData2, keepDims, outputTensorInfo2); - BOOST_ASSERT(outputTensorInfo2.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo2.GetShape()[0] == 12); + BOOST_TEST(outputTensorInfo2.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo2.GetShape()[0] == 12); // Reducing dimensions 0,1 results in a 4 size tensor (one dimension) std::set<unsigned int> axisData3 = { 0, 1 }; @@ -47,8 +47,8 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData3, keepDims, outputTensorInfo3); - BOOST_ASSERT(outputTensorInfo3.GetNumDimensions() == 1); - BOOST_ASSERT(outputTensorInfo3.GetShape()[0] == 4); + BOOST_TEST(outputTensorInfo3.GetNumDimensions() == 1); + BOOST_TEST(outputTensorInfo3.GetShape()[0] == 4); // Reducing dimension 0 results in a { 1, 3, 4 } dimension tensor keepDims = true; @@ -58,10 +58,10 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData4, keepDims, outputTensorInfo4); - BOOST_ASSERT(outputTensorInfo4.GetNumDimensions() == 3); - BOOST_ASSERT(outputTensorInfo4.GetShape()[0] == 1); - BOOST_ASSERT(outputTensorInfo4.GetShape()[1] == 3); - BOOST_ASSERT(outputTensorInfo4.GetShape()[2] == 4); + BOOST_TEST(outputTensorInfo4.GetNumDimensions() == 3); + BOOST_TEST(outputTensorInfo4.GetShape()[0] == 1); + BOOST_TEST(outputTensorInfo4.GetShape()[1] == 3); + BOOST_TEST(outputTensorInfo4.GetShape()[2] == 4); // Reducing dimension 1, 2 results in a { 2, 1, 1 } dimension tensor keepDims = true; @@ -71,10 +71,10 @@ BOOST_AUTO_TEST_CASE(CalculateReducedOutputTensoInfoTest) CalculateReducedOutputTensoInfo(inputTensorInfo, axisData5, keepDims, outputTensorInfo5); - BOOST_ASSERT(outputTensorInfo5.GetNumDimensions() == 3); - BOOST_ASSERT(outputTensorInfo5.GetShape()[0] == 2); - BOOST_ASSERT(outputTensorInfo5.GetShape()[1] == 1); - BOOST_ASSERT(outputTensorInfo5.GetShape()[2] == 1); + BOOST_TEST(outputTensorInfo5.GetNumDimensions() == 3); + BOOST_TEST(outputTensorInfo5.GetShape()[0] == 2); + BOOST_TEST(outputTensorInfo5.GetShape()[1] == 1); + BOOST_TEST(outputTensorInfo5.GetShape()[2] == 1); } diff --git a/src/armnnUtils/test/PrototxtConversionsTest.cpp b/src/armnnUtils/test/PrototxtConversionsTest.cpp index f263a52340..d51c8015cf 100644 --- a/src/armnnUtils/test/PrototxtConversionsTest.cpp +++ b/src/armnnUtils/test/PrototxtConversionsTest.cpp @@ -15,28 +15,28 @@ BOOST_AUTO_TEST_CASE(ConvertInt32ToOctalStringTest) using armnnUtils::ConvertInt32ToOctalString; std::string octalString = ConvertInt32ToOctalString(1); - BOOST_ASSERT(octalString.compare("\\\\001\\\\000\\\\000\\\\000")); + BOOST_TEST(octalString.compare("\\\\001\\\\000\\\\000\\\\000")); octalString = ConvertInt32ToOctalString(256); - BOOST_ASSERT(octalString.compare("\\\\000\\\\100\\\\000\\\\000")); + BOOST_TEST(octalString.compare("\\\\000\\\\100\\\\000\\\\000")); octalString = ConvertInt32ToOctalString(65536); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\100\\\\000")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\100\\\\000")); octalString = ConvertInt32ToOctalString(16777216); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\000\\\\100")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\000\\\\100")); octalString = ConvertInt32ToOctalString(-1); - BOOST_ASSERT(octalString.compare("\\\\377\\\\377\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\377\\\\377\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-256); - BOOST_ASSERT(octalString.compare("\\\\000\\\\377\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\377\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-65536); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\377\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\377\\\\377")); octalString = ConvertInt32ToOctalString(-16777216); - BOOST_ASSERT(octalString.compare("\\\\000\\\\000\\\\000\\\\377")); + BOOST_TEST(octalString.compare("\\\\000\\\\000\\\\000\\\\377")); } BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) @@ -51,13 +51,13 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) }; auto output_string = createAndConvert({5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 5\n" "}")); output_string = createAndConvert({4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 4\n" "}\n" @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 3\n" "}\n" @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({2, 3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 2\n" "}\n" @@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({1, 2, 3, 4, 5}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 1\n" "}\n" @@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({0xffffffff, 0xffffffff}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 4294967295\n" "}\n" @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE(ConvertTensorShapeToStringTest) )); output_string = createAndConvert({1, 0}); - BOOST_ASSERT(output_string.compare( + BOOST_TEST(output_string.compare( "dim {\n" "size: 1\n" "}\n" |