diff options
author | Finn Williams <Finn.Williams@arm.com> | 2020-07-03 10:12:03 +0100 |
---|---|---|
committer | Finn Williams <Finn.Williams@arm.com> | 2020-07-10 19:27:07 +0100 |
commit | 87d0bda9b49d9df4455f1887027e5ead2527c27e (patch) | |
tree | c58787cce03027d3e1969a169f162f59a8b06f37 /src/armnn/layers/SplitterLayer.cpp | |
parent | c9f74d775da0039fd899f9ee6ec02b98ad575250 (diff) | |
download | armnn-87d0bda9b49d9df4455f1887027e5ead2527c27e.tar.gz |
IVGCVSW-4929 Implement ShapeInferenceMethod in all Layers
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I2c2d99f97cf89814140b057a9f93f41b364197f5
Diffstat (limited to 'src/armnn/layers/SplitterLayer.cpp')
-rw-r--r-- | src/armnn/layers/SplitterLayer.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 9455c88041..60dc9611e8 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "SplitterLayer.hpp" @@ -141,7 +141,10 @@ std::vector<TensorShape> SplitterLayer::InferOutputShapes(const std::vector<Tens void SplitterLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) { - IgnoreUnused(shapeInferenceMethod); + std::for_each(BeginOutputSlots(), EndOutputSlots(), [&](OutputSlot& outputSlot) + { + VerifyShapeInferenceType(outputSlot.GetTensorInfo().GetShape(), shapeInferenceMethod); + }); std::vector<TensorShape> views; for (unsigned int viewIdx = 0; viewIdx < m_Param.GetNumViews(); viewIdx++) @@ -156,10 +159,11 @@ void SplitterLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInf for (unsigned int viewIdx = 0; viewIdx < m_Param.GetNumViews(); viewIdx++) { - ConditionalThrowIfNotEqual<LayerValidationException>( - "SplitterLayer: View sizes must match output tensor shapes.", - GetOutputSlot(viewIdx).GetTensorInfo().GetShape(), - inferredShapes[viewIdx]); + ValidateAndCopyShape(GetOutputSlot(viewIdx).GetTensorInfo().GetShape(), + inferredShapes[viewIdx], + shapeInferenceMethod, + "SplitterLayer", + viewIdx); } } |