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/MeanLayer.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/MeanLayer.cpp')
| -rw-r--r-- | src/armnn/layers/MeanLayer.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp index 9cefd7d1f8..da635661e1 100644 --- a/src/armnn/layers/MeanLayer.cpp +++ b/src/armnn/layers/MeanLayer.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 // @@ -40,10 +40,12 @@ MeanLayer* MeanLayer::Clone(Graph& graph) const void MeanLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) { - IgnoreUnused(shapeInferenceMethod); - VerifyLayerConnections(1, CHECK_LOCATION()); + const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); + + VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + const TensorInfo& input = GetInputSlot(0).GetConnection()->GetTensorInfo(); ARMNN_ASSERT_MSG(input.GetNumDimensions() > 0 && input.GetNumDimensions() <= 4, @@ -95,10 +97,7 @@ void MeanLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferen } const TensorShape& inferredShape = TensorShape(outputRank, dimSizes.data()); - ConditionalThrowIfNotEqual<LayerValidationException>( - "MeanLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShape); + ValidateAndCopyShape(outputShape, inferredShape, shapeInferenceMethod, "MeanLayer"); } void MeanLayer::Accept(ILayerVisitor& visitor) const |