From a68241066c3e797dab70f515d2c55aaa74abf564 Mon Sep 17 00:00:00 2001 From: arovir01 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 --- .../NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp') diff --git a/src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp b/src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp index 58d6061537..26705c01a2 100644 --- a/src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp +++ b/src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp @@ -14,7 +14,7 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i const TensorInfo& output, const DepthwiseConvolution2dDescriptor& descriptor, const TensorInfo& weights, - const TensorInfo& biases) + const boost::optional& biases) { const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); @@ -25,9 +25,12 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i arm_compute::TensorInfo aclBiasesInfo; arm_compute::TensorInfo *optionalAclBiasesInfo = nullptr; + if (descriptor.m_BiasEnabled) { - aclBiasesInfo = armcomputetensorutils::BuildArmComputeTensorInfo(biases); + BOOST_ASSERT(biases.is_initialized()); + + aclBiasesInfo = armcomputetensorutils::BuildArmComputeTensorInfo(biases.get()); optionalAclBiasesInfo = &aclBiasesInfo; } @@ -43,4 +46,4 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i aclDepthMultiplier); } -} +} \ No newline at end of file -- cgit v1.2.1