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/SwitchLayer.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/SwitchLayer.cpp')
| -rw-r--r-- | src/armnn/layers/SwitchLayer.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/armnn/layers/SwitchLayer.cpp b/src/armnn/layers/SwitchLayer.cpp index d408de89e7..b763b0804c 100644 --- a/src/armnn/layers/SwitchLayer.cpp +++ b/src/armnn/layers/SwitchLayer.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 // #include "SwitchLayer.hpp" @@ -29,28 +29,25 @@ SwitchLayer* SwitchLayer::Clone(Graph& graph) const void SwitchLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) { - IgnoreUnused(shapeInferenceMethod); - VerifyLayerConnections(2, CHECK_LOCATION()); + const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); + + VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + ARMNN_ASSERT_MSG(GetNumOutputSlots() == 2, "SwitchLayer: The layer should return 2 outputs."); // Assuming first input is the Input and second input is the Constant std::vector<TensorShape> inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), - GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape() }); + GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape()}); ARMNN_ASSERT(inferredShapes.size() == 2); - ConditionalThrowIfNotEqual<LayerValidationException>( - "SwitchLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), - inferredShapes[0]); + ValidateAndCopyShape(outputShape, inferredShapes[0], shapeInferenceMethod, "SwitchLayer"); - ConditionalThrowIfNotEqual<LayerValidationException>( - "SwitchLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(1).GetTensorInfo().GetShape(), - inferredShapes[0]); + ValidateAndCopyShape( + GetOutputSlot(1).GetTensorInfo().GetShape(), inferredShapes[1], shapeInferenceMethod, "SwitchLayer", 1); } void SwitchLayer::Accept(ILayerVisitor& visitor) const |