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/armnnCaffeParser | |
| 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/armnnCaffeParser')
| -rw-r--r-- | src/armnnCaffeParser/CaffeParser.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/armnnCaffeParser/CaffeParser.cpp b/src/armnnCaffeParser/CaffeParser.cpp index ce5c5bd4f5..b95d3bcc08 100644 --- a/src/armnnCaffeParser/CaffeParser.cpp +++ b/src/armnnCaffeParser/CaffeParser.cpp @@ -13,8 +13,9 @@ #include "GraphTopologicalSort.hpp" #include "VerificationHelpers.hpp" +#include <armnn/utility/Assert.hpp> + #include <boost/numeric/conversion/cast.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> // Caffe @@ -363,7 +364,7 @@ vector<const LayerParameter*> CaffeParserBase::GetInputs(const LayerParameter& l void CaffeParserBase::ParseInputLayer(const LayerParameter& layerParam) { - BOOST_ASSERT(layerParam.type() == "Input"); + ARMNN_ASSERT(layerParam.type() == "Input"); ValidateNumInputsOutputs(layerParam, 0, 1); const InputParameter& param = layerParam.input_param(); @@ -421,7 +422,7 @@ void CaffeParserBase::AddConvLayerWithSplits(const caffe::LayerParameter& layerP unsigned int kernelW, unsigned int kernelH) { - BOOST_ASSERT(layerParam.type() == "Convolution"); + ARMNN_ASSERT(layerParam.type() == "Convolution"); ValidateNumInputsOutputs(layerParam, 1, 1); ConvolutionParameter convParam = layerParam.convolution_param(); @@ -429,8 +430,8 @@ void CaffeParserBase::AddConvLayerWithSplits(const caffe::LayerParameter& layerP const unsigned int numGroups = convParam.has_group() ? convParam.group() : 1; // asusme these were already verified by the caller ParseConvLayer() function - BOOST_ASSERT(numGroups < inputShape.dim(1)); - BOOST_ASSERT(numGroups > 1); + ARMNN_ASSERT(numGroups < inputShape.dim(1)); + ARMNN_ASSERT(numGroups > 1); // Handle grouping armnn::IOutputSlot& inputConnection = GetArmnnOutputSlotForCaffeTop(layerParam.bottom(0)); @@ -613,7 +614,7 @@ void CaffeParserBase::AddConvLayerWithDepthwiseConv(const caffe::LayerParameter& unsigned int kernelW, unsigned int kernelH) { - BOOST_ASSERT(layerParam.type() == "Convolution"); + ARMNN_ASSERT(layerParam.type() == "Convolution"); ValidateNumInputsOutputs(layerParam, 1, 1); ConvolutionParameter convParam = layerParam.convolution_param(); @@ -711,7 +712,7 @@ void CaffeParserBase::ParseConvLayer(const LayerParameter& layerParam) // Not Available ArmNN Interface Parameters // * Rounding policy; - BOOST_ASSERT(layerParam.type() == "Convolution"); + ARMNN_ASSERT(layerParam.type() == "Convolution"); ValidateNumInputsOutputs(layerParam, 1, 1); ConvolutionParameter convParam = layerParam.convolution_param(); |