From a68241066c3e797dab70f515d2c55aaa74abf564 Mon Sep 17 00:00:00 2001
From: arovir01 <Aron.Virginas-Tar@arm.com>
Date: Tue, 28 Aug 2018 17:40:45 +0100
Subject: IVGCVSW-1324: Make biases truly optional for Conv2d and
 DepthwiseConvolution

!android-nn-driver:145961

Change-Id: I039ab0adc61725859514246365b5e5b5fa603eaa
---
 src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp')

diff --git a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp
index 9851a22dc6..be4c33500e 100644
--- a/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp
+++ b/src/armnn/backends/ClWorkloads/ClConvolution2dBaseWorkload.cpp
@@ -17,17 +17,20 @@ arm_compute::Status ClConvolution2dWorkloadValidate(const TensorInfo& input,
     const TensorInfo& output,
     const Convolution2dDescriptor& descriptor,
     const TensorInfo& weights,
-    const TensorInfo& biases)
+    const boost::optional<TensorInfo>& biases)
 {
     const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input);
     const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output);
     const arm_compute::TensorInfo aclWeightsInfo = BuildArmComputeTensorInfo(weights);
+
     arm_compute::TensorInfo aclBiasesInfo;
     arm_compute::TensorInfo *optionalAclBiasesInfo = nullptr;
 
     if (descriptor.m_BiasEnabled)
     {
-        aclBiasesInfo  = BuildArmComputeTensorInfo(biases);
+        BOOST_ASSERT(biases.is_initialized());
+
+        aclBiasesInfo = BuildArmComputeTensorInfo(biases.get());
         optionalAclBiasesInfo = &aclBiasesInfo;
     }
 
-- 
cgit v1.2.1