commit f663d48716c3adb179d61055f56f25d11d9640e4
author Teresa Charlin <teresa.charlinreyes@arm.com> Thu May 11 15:31:00 2023 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Tue May 23 13:27:10 2023 +0000
tree 23cc725c2c48caaa2a664ad75bf7e209e8521446
parent da341f789d57d5d6e308bddb2eb91465265276fa

IVGCVSW-7732 Enable dynamic bias in FullyConnected in CpuAcc and GpuAcc

* Dynamic bias are supported by ACL for this layer.

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

src/backends/cl/workloads/ClFullyConnectedWorkload.cpp

diff --git a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp
index 1f26b09..727ae56 100644
--- a/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp
+++ b/src/backends/cl/workloads/ClFullyConnectedWorkload.cpp
@@ -33,12 +33,6 @@
     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,
-                                        "Arm NN ClFullyConnectedWorkload does not support non constant bias."};
-        }
         aclBiases = BuildArmComputeTensorInfo(biases.value());
         aclBiases.set_are_values_constant(biases.value().IsConstant());
         optionalAclBiases = &aclBiases;
@@ -74,9 +68,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::ActivationLayerInfo activationInfo = ConvertAdditionalInfoToAclActivationLayerInfo(descriptor);

src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp

diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
index ee3de80..12eff36 100644
--- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
+++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
@@ -38,12 +38,6 @@
     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,
-                                        "Arm NN NeonFullyConnectedWorkload does not support non constant bias."};
-        }
         aclBiases = BuildArmComputeTensorInfo(biases.value());
         aclBiases.set_are_values_constant(biases.value().IsConstant());
         optionalAclBiases = &aclBiases;
@@ -85,9 +79,6 @@
         m_BiasesTensorInfo = info.m_InputTensorInfos[2];
         BuildArmComputeTensor(*m_BiasesTensor, m_BiasesTensorInfo);
         m_BiasesTensor->info()->set_are_values_constant(m_BiasesTensorInfo.IsConstant());
-
-        // We do not support dynamic bias
-        ARMNN_ASSERT(m_BiasesTensorInfo.IsConstant() == true);
     }
 
     const arm_compute::ActivationLayerInfo activationInfo = ConvertAdditionalInfoToAclActivationLayerInfo(descriptor);