From 87d0bda9b49d9df4455f1887027e5ead2527c27e Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Fri, 3 Jul 2020 10:12:03 +0100 Subject: IVGCVSW-4929 Implement ShapeInferenceMethod in all Layers Signed-off-by: Finn Williams Change-Id: I2c2d99f97cf89814140b057a9f93f41b364197f5 --- src/armnn/layers/GatherLayer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/armnn/layers/GatherLayer.cpp') diff --git a/src/armnn/layers/GatherLayer.cpp b/src/armnn/layers/GatherLayer.cpp index 3e85d25dac..52bf4324a2 100644 --- a/src/armnn/layers/GatherLayer.cpp +++ b/src/armnn/layers/GatherLayer.cpp @@ -31,10 +31,12 @@ GatherLayer* GatherLayer::Clone(Graph& graph) const void GatherLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) { - IgnoreUnused(shapeInferenceMethod); - VerifyLayerConnections(2, CHECK_LOCATION()); + const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); + + VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + const TensorInfo& params = GetInputSlot(0).GetConnection()->GetTensorInfo(); const TensorInfo& indices = GetInputSlot(1).GetConnection()->GetTensorInfo(); @@ -66,10 +68,7 @@ void GatherLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInfer const TensorShape& inferredShape = TensorShape(outputDim, dimSizes.data()); - ConditionalThrowIfNotEqual( - "GatherLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShape); + ValidateAndCopyShape(outputShape, inferredShape, shapeInferenceMethod, "GatherLayer"); } void GatherLayer::Accept(ILayerVisitor& visitor) const -- cgit v1.2.1