From ac2770a4bb6461bfbddec928bb6208f26f898f02 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Wed, 1 Apr 2020 16:51:23 +0100 Subject: 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 Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff --- src/armnnCaffeParser/CaffeParser.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/armnnCaffeParser/CaffeParser.cpp') 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 + #include -#include #include // Caffe @@ -363,7 +364,7 @@ vector 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(); -- cgit v1.2.1