diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-06-30 15:18:26 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2023-07-03 15:32:04 +0000 |
| commit | a9ac6ba643e8dc4fee88bd0e7e186f0918080c4b (patch) | |
| tree | 4e05fbb098b30f3d2c7d3e5b4b83d48c9bdd59ac /src/armnn/layers/Convolution2dLayer.cpp | |
| parent | 6d2d4ead359aa02d502f15cfcb7e69c7658bd1ed (diff) | |
| download | armnn-a9ac6ba643e8dc4fee88bd0e7e186f0918080c4b.tar.gz | |
IVGCVSW-7828 Add an Optional TensorInfo to InputSlot
* Updated calls to use the new function
From:
GetInputSlot(n).GetConnection()->GetTensorInfo();
To:
GetInputSlot(n).GetTensorInfo();
* Added UnitTests
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I43184cc05e4472011b9347aaa820eb8deb1cd4a0
Diffstat (limited to 'src/armnn/layers/Convolution2dLayer.cpp')
| -rw-r--r-- | src/armnn/layers/Convolution2dLayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index f6a5583aad..df971a517d 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -31,8 +31,8 @@ void Convolution2dLayer::SerializeLayerParameters(ParameterStringifyFunction& fn //using DescriptorType = Parameters; const std::vector<TensorShape>& inputShapes = { - GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), - GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape() + GetInputSlot(0).GetTensorInfo().GetShape(), + GetInputSlot(1).GetTensorInfo().GetShape() }; const TensorShape filterShape = inputShapes[1]; DataLayoutIndexed dataLayoutIndex(m_Param.m_DataLayout); @@ -111,8 +111,8 @@ void Convolution2dLayer::ValidateTensorShapesFromInputs() "Convolution2dLayer: Weights should be connected to input slot 1."); std::vector<TensorShape> inferredShapes = InferOutputShapes({ - GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape(), - GetInputSlot(1).GetConnection()->GetTensorInfo().GetShape() }); + GetInputSlot(0).GetTensorInfo().GetShape(), + GetInputSlot(1).GetTensorInfo().GetShape() }); ARMNN_ASSERT(inferredShapes.size() == 1); |