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/GatherLayer.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/GatherLayer.cpp')
-rw-r--r-- | src/armnn/layers/GatherLayer.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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<LayerValidationException>( - "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 |