diff options
author | Mike Kelly <mike.kelly@arm.com> | 2022-11-25 13:55:24 +0000 |
---|---|---|
committer | mike.kelly <mike.kelly@arm.com> | 2022-12-12 15:58:21 +0000 |
commit | ec67a0f08e0f96a5aebf3cac65331c67f6649f5e (patch) | |
tree | 94146a1f43c74d89d83fd5da54688ae0fc19cf85 /src/armnnTestUtils/CommonTestUtils.hpp | |
parent | 5383767a7a759c867235ab66bd71f88281e3bd06 (diff) | |
download | armnn-ec67a0f08e0f96a5aebf3cac65331c67f6649f5e.tar.gz |
IVGCVSW-7209 Remove deprecated code due to be removed in 23.02
* Removed weights and bias from Convolution, DepthwiseConv & FullyConnected
layers
* Removed the weight and bias ConstTensorHandles from the QueueDescriptors
* Updated Workloads to take tensors from WorkloadInfo rather than the
QueueDescriptors
* Removed unused RedirectMembersToConstantInputs optimization and tests.
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I9ffcdc4a1c0dff725539dd69fc435b700bd98a56
Diffstat (limited to 'src/armnnTestUtils/CommonTestUtils.hpp')
-rw-r--r-- | src/armnnTestUtils/CommonTestUtils.hpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/armnnTestUtils/CommonTestUtils.hpp b/src/armnnTestUtils/CommonTestUtils.hpp index 5b4b356247..4262ed5180 100644 --- a/src/armnnTestUtils/CommonTestUtils.hpp +++ b/src/armnnTestUtils/CommonTestUtils.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -70,15 +70,6 @@ inline bool Compare(T a, T b, float tolerance = 0.000001f) return std::fabs(static_cast<float>(a) - static_cast<float>(b)) <= tolerance; } -template <typename ConvolutionLayer> -void SetWeightAndBias(ConvolutionLayer* layer, const armnn::TensorInfo& weightInfo, const armnn::TensorInfo& biasInfo) -{ - layer->m_Weight = std::make_unique<armnn::ScopedTensorHandle>(weightInfo); - layer->m_Bias = std::make_unique<armnn::ScopedTensorHandle>(biasInfo); - - layer->m_Weight->Allocate(); - layer->m_Bias->Allocate(); -} armnn::SubgraphView::InputSlots CreateInputsFrom(armnn::Layer* layer, std::vector<unsigned int> ignoreSlots = {}); |