aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/layers/MeanLayer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/armnn/layers/MeanLayer.cpp')
-rw-r--r--src/armnn/layers/MeanLayer.cpp13
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