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/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp') diff --git a/src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp b/src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp index 21aed869f5..ea4de9df6f 100644 --- a/src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp +++ b/src/armnn/optimizations/PermuteAndBatchToSpaceAsDepthToSpace.hpp @@ -22,7 +22,7 @@ public: { // Validate base layer (the Permute) is compatible Layer& base = connection.GetConnectedOutputSlot()->GetOwningLayer(); - BOOST_ASSERT(base.GetType() == LayerType::Permute || base.GetType() == LayerType::Transpose); + ARMNN_ASSERT(base.GetType() == LayerType::Permute || base.GetType() == LayerType::Transpose); const TensorInfo& inputInfo = base.GetInputSlot(0).GetConnection()->GetTensorInfo(); const TensorInfo& intermediateInfo = base.GetOutputSlot(0).GetTensorInfo(); if (intermediateInfo.GetNumDimensions() != 4) @@ -39,7 +39,7 @@ public: // Validate child layer (the BatchToSpace) is compatible Layer& child = connection.GetOwningLayer(); - BOOST_ASSERT(child.GetType() == LayerType::BatchToSpaceNd); + ARMNN_ASSERT(child.GetType() == LayerType::BatchToSpaceNd); const TensorInfo& outputInfo = child.GetOutputSlot(0).GetTensorInfo(); const BatchToSpaceNdDescriptor& batchToSpaceDesc = static_cast(child).GetParameters(); if (batchToSpaceDesc.m_DataLayout != DataLayout::NHWC) -- cgit v1.2.1