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/armnn/layers/MergeLayer.cpp | |
| 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/armnn/layers/MergeLayer.cpp')
| -rw-r--r-- | src/armnn/layers/MergeLayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/armnn/layers/MergeLayer.cpp b/src/armnn/layers/MergeLayer.cpp index f2fd29fe9e..ad7d8b1416 100644 --- a/src/armnn/layers/MergeLayer.cpp +++ b/src/armnn/layers/MergeLayer.cpp @@ -36,7 +36,7 @@ void MergeLayer::ValidateTensorShapesFromInputs() GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape(), }); - BOOST_ASSERT(inferredShapes.size() == 1); + ARMNN_ASSERT(inferredShapes.size() == 1); ConditionalThrowIfNotEqual<LayerValidationException>( "MergeLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", @@ -46,7 +46,7 @@ void MergeLayer::ValidateTensorShapesFromInputs() std::vector<TensorShape> MergeLayer::InferOutputShapes(const std::vector<TensorShape>& inputShapes) const { - BOOST_ASSERT(inputShapes.size() == 2); + ARMNN_ASSERT(inputShapes.size() == 2); ConditionalThrowIfNotEqual<LayerValidationException>( "MergeLayer: TensorShapes set on inputs do not match", |