commit 67d6390c3b37c83bad2180ee4dc54893143c7b29
author Matthew Bentham <matthew.bentham@arm.com> Tue Feb 08 15:03:07 2022 +0000
committer Matthew Bentham <matthew.bentham@arm.com> Tue Feb 08 15:25:06 2022 +0000
tree 41b0392841c3e070e60f264ebdf1910be49c9176
parent c42a987aa53d0fd842c34dee90abef5a9ff15fa4

Handle optional biases better in Neon/Cl FullyConnected workloads

Use armnn::Optional for optional bias TensorInfos, similar to how
it's already done in Convolution etc.

Fixes some test failures found using -fsanitize=undefined

Change-Id: I7b887e63e2ffab14aeab14415069be738d938ebb
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>

src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp

diff --git a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
index 39a5696..26c68b7 100644
--- a/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
+++ b/src/backends/neon/workloads/NeonFullyConnectedWorkload.cpp
@@ -24,7 +24,7 @@
 arm_compute::Status NeonFullyConnectedWorkloadValidate(const TensorInfo& input,
                                                        const TensorInfo& output,
                                                        const TensorInfo& weights,
-                                                       const TensorInfo& biases,
+                                                       const Optional<TensorInfo>& biases,
                                                        const FullyConnectedDescriptor& descriptor,
                                                        const ActivationDescriptor* activationDescriptor)
 {
@@ -36,7 +36,8 @@
     arm_compute::TensorInfo* optionalAclBiases = nullptr;
     if (descriptor.m_BiasEnabled)
     {
-        aclBiases = BuildArmComputeTensorInfo(biases);
+        ARMNN_ASSERT(biases.has_value());
+        aclBiases = BuildArmComputeTensorInfo(biases.value());
         optionalAclBiases = &aclBiases;
     }