commit 9953db843c0d0f9746707c7c2ddae84af35885c4
author Kevin May <kevin.may@arm.com> Thu Jun 08 15:34:23 2023 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Tue Jun 13 13:01:56 2023 +0000
tree 9b052bd13ffcaa192cd2bd173294f21434a1d872
parent 0fc1988881fea206e9bb3fdda511784594ff5956

IVGCVSW-7790 - Enable dynamic bias in DWConv in GpuAcc

* Remove checks for ias being constant
* Convert ARMNN_ASSERTS to throw

Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: I009f4008393502bd9e30269151ad935ef67f0bc1

src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp

diff --git a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
index e6c9cb5..91366d7 100644
--- a/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
+++ b/src/backends/cl/workloads/ClDepthwiseConvolutionWorkload.cpp
@@ -54,12 +54,10 @@
     arm_compute::TensorInfo* optionalAclBiasesInfo = nullptr;
     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())
+        if (!biases.has_value())
         {
             return arm_compute::Status{arm_compute::ErrorCode::RUNTIME_ERROR,
-                                       "ArmNN ClDepthwiseConv2dWorkload does not support non constant bias."};
+                                       "ArmNN ClDepthwiseConv2dWorkload has empty bias value."};
         }
         aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout);
         aclBiasesInfo.set_are_values_constant(biases.value().IsConstant());
@@ -112,8 +110,6 @@
     {
         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(