diff options
| author | arovir01 <Aron.Virginas-Tar@arm.com> | 2018-08-28 17:40:45 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-09-17 17:21:21 +0100 |
| commit | a68241066c3e797dab70f515d2c55aaa74abf564 (patch) | |
| tree | 9f5b70a02dcd7d5d61d58e2bf235ee473be53ce5 /src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp | |
| parent | c577f2c6a3b4ddb6ba87a882723c53a248afbeba (diff) | |
| download | armnn-a68241066c3e797dab70f515d2c55aaa74abf564.tar.gz | |
IVGCVSW-1324: Make biases truly optional for Conv2d and DepthwiseConvolution
!android-nn-driver:145961
Change-Id: I039ab0adc61725859514246365b5e5b5fa603eaa
Diffstat (limited to 'src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp')
| -rw-r--r-- | src/armnn/backends/NeonWorkloads/NeonDepthwiseConvolutionBaseWorkload.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
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<TensorInfo>& 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 |