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/backends/backendsCommon/test/WorkloadDataValidation.cpp | |
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/backends/backendsCommon/test/WorkloadDataValidation.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/WorkloadDataValidation.cpp | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp index fed21eb911..2a09f6508f 100644 --- a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp +++ b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -158,13 +158,8 @@ TEST_CASE("FullyConnectedQueueDescriptor_Validate_RequiredDataMissing") FullyConnectedQueueDescriptor invalidData; WorkloadInfo invalidInfo; - ScopedTensorHandle weightTensor(weightsDesc); - ScopedTensorHandle biasTensor(biasesDesc); - AddInputToWorkload(invalidData, invalidInfo, inputTensorInfo, nullptr); AddOutputToWorkload(invalidData, invalidInfo, outputTensorInfo, nullptr); - invalidData.m_Weight = &weightTensor; - invalidData.m_Bias = &biasTensor; invalidData.m_Parameters.m_BiasEnabled = true; invalidData.m_Parameters.m_TransposeWeightMatrix = false; @@ -678,16 +673,10 @@ TEST_CASE("BiasPerAxisQuantization_ValidateCorrectValues") AddInputToWorkload(queueDescriptor, workloadInfo, weightInfo, nullptr); AddOutputToWorkload(queueDescriptor, workloadInfo, outputInfo, nullptr); - ScopedTensorHandle weightTensor(weightInfo); - queueDescriptor.m_Weight = &weightTensor; - // Test 1: correct per-axis quantization values const std::vector<float> biasPerAxisScales1 = { 3.75f, 5.25f }; const TensorInfo biasInfo1(biasShape, biasType, biasPerAxisScales1, 0); - ScopedTensorHandle biasHandle1(biasInfo1); - queueDescriptor.m_Bias = &biasHandle1; - AddInputToWorkload(queueDescriptor, workloadInfo, biasInfo1, nullptr); CHECK_NOTHROW(queueDescriptor.Validate(workloadInfo)); @@ -729,16 +718,10 @@ TEST_CASE("BiasPerAxisQuantization_ValidateIncorrectValues") AddInputToWorkload(queueDescriptor, workloadInfo, weightInfo, nullptr); AddOutputToWorkload(queueDescriptor, workloadInfo, outputInfo, nullptr); - ScopedTensorHandle weightTensor(weightInfo); - queueDescriptor.m_Weight = &weightTensor; - - // Test 2: wrong per-axis quantization values + // Test 2: wrong per-axis quantization values const std::vector<float> biasPerAxisScales2 = { 4.00f, 5.00f }; const TensorInfo biasInfo2(biasShape, biasType, biasPerAxisScales2, 0); - ScopedTensorHandle biasHandle2(biasInfo2); - queueDescriptor.m_Bias = &biasHandle2; - AddInputToWorkload(queueDescriptor, workloadInfo, biasInfo2, nullptr); CHECK_NOTHROW(queueDescriptor.Validate(workloadInfo)); @@ -781,16 +764,10 @@ TEST_CASE("BiasPerAxisQuantization_ValidateInvalidArgumentException") AddInputToWorkload(queueDescriptor, workloadInfo, weightInfo, nullptr); AddOutputToWorkload(queueDescriptor, workloadInfo, outputInfo, nullptr); - ScopedTensorHandle weightTensor(weightInfo); - queueDescriptor.m_Weight = &weightTensor; - // Test 3: mismatched number of quantization scales const std::vector<float> biasPerAxisScales3 = { 3.75f, 5.25f, 5.25f }; const TensorInfo biasInfo3(biasShape, biasType, biasPerAxisScales3, 0); - ScopedTensorHandle biasHandle3(biasInfo3); - queueDescriptor.m_Bias = &biasHandle3; - AddInputToWorkload(queueDescriptor, workloadInfo, biasInfo3, nullptr); CHECK_THROWS_AS(queueDescriptor.Validate(workloadInfo), InvalidArgumentException); |