commit acedd859c64fff029ef89ac47dd1083434c3cec4
author TeresaARM <teresa.charlinreyes@arm.com> Thu May 11 15:16:39 2023 +0000
committer Teresa Charlin <teresa.charlinreyes@arm.com> Thu May 11 17:19:27 2023 +0100
tree 463e95ba946840c7b1b869b93538bf5b846795bd
parent fecd9ed396705a17805ffc49839bd82ae24c892b

Revert "IVGCVSW-7454 Enable dynamic bias in CpuAcc and GpuAcc in Conv2d DWConv and FC"

This reverts commit fecd9ed396705a17805ffc49839bd82ae24c892b.

Reason for revert: IVGCVSW-7727 Dynamic bias CTS failing

Change-Id: I53f67d60fca0e60a81298f90450ceef26b97c321
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>

src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp

diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
index 05f95ff..e6c9cb5 100644
--- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
@@ -55,6 +55,12 @@
     if (descriptor.m_BiasEnabled)
     {
         ARMNN_ASSERT(biases.has_value());
+        // Same for bias as weights. We don't currently support non const.
+        if (!biases.value().IsConstant())
+        {
+            return arm_compute::Status{arm_compute::ErrorCode::RUNTIME_ERROR,
+                                       "ArmNN ClDepthwiseConv2dWorkload does not support non constant bias."};
+        }
         aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout);
         aclBiasesInfo.set_are_values_constant(biases.value().IsConstant());
         optionalAclBiasesInfo = &aclBiasesInfo;
@@ -106,6 +112,8 @@
     {
         bias = &PolymorphicDowncast<IClTensorHandle*>(m_Data.m_Inputs[2])->GetTensor();
         bias->info()->set_are_values_constant(info.m_InputTensorInfos[2].IsConstant());
+        // We do not support dynamic bias
+        ARMNN_ASSERT(info.m_InputTensorInfos[2].IsConstant() == true);
     }
 
     const arm_compute::Size2D aclDilationInfo = BuildArmComputeSize2D(