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/RankLayer.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/RankLayer.cpp')
| -rw-r--r-- | src/armnn/layers/RankLayer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/armnn/layers/RankLayer.cpp b/src/armnn/layers/RankLayer.cpp index f1a24b1633..62f77df16f 100644 --- a/src/armnn/layers/RankLayer.cpp +++ b/src/armnn/layers/RankLayer.cpp @@ -34,11 +34,12 @@ void RankLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferen IgnoreUnused(shapeInferenceMethod); VerifyLayerConnections(1, CHECK_LOCATION()); - ConditionalThrowIfNotEqual<LayerValidationException>( - "Rank: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), {TensorShape{Dimensionality::Scalar}}); -} + const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); + const TensorShape inferredShape = TensorShape(Dimensionality::Scalar); + VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + ValidateAndCopyShape(outputShape, inferredShape, shapeInferenceMethod, "RankLayer"); +} void RankLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitRankLayer(this, GetName()); |