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/TransposeConvolution2dLayer.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/TransposeConvolution2dLayer.cpp')
| -rw-r--r-- | src/armnn/layers/TransposeConvolution2dLayer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/armnn/layers/TransposeConvolution2dLayer.cpp b/src/armnn/layers/TransposeConvolution2dLayer.cpp index 8a264253e0..7074be9659 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.cpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.cpp @@ -1,13 +1,11 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "TransposeConvolution2dLayer.hpp" #include "LayerCloneBase.hpp" -#include <armnn/TypesUtils.hpp> - #include <armnnUtils/DataLayoutIndexed.hpp> #include <backendsCommon/CpuTensorHandle.hpp> @@ -105,10 +103,12 @@ std::vector<TensorShape> TransposeConvolution2dLayer::InferOutputShapes( void TransposeConvolution2dLayer::ValidateTensorShapesFromInputs(ShapeInferenceMethod shapeInferenceMethod) { - IgnoreUnused(shapeInferenceMethod); - VerifyLayerConnections(1, CHECK_LOCATION()); + const TensorShape& outputShape = GetOutputSlot(0).GetTensorInfo().GetShape(); + + VerifyShapeInferenceType(outputShape, shapeInferenceMethod); + ARMNN_ASSERT_MSG(m_Weight != nullptr, "TransposeConvolution2dLayer: Weight data cannot be null."); std::vector<TensorShape> expectedOutputShape; @@ -127,10 +127,7 @@ void TransposeConvolution2dLayer::ValidateTensorShapesFromInputs(ShapeInferenceM ARMNN_ASSERT(expectedOutputShape.size() == 1); - ConditionalThrowIfNotEqual<LayerValidationException>( - "TransposeConvolution2dLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", - GetOutputSlot(0).GetTensorInfo().GetShape(), - expectedOutputShape[0]); + ValidateAndCopyShape(outputShape, expectedOutputShape[0], shapeInferenceMethod, "TransposeConvolution2dLayer"); } Layer::ConstantTensors TransposeConvolution2dLayer::GetConstantTensorsByRef() |