From 47016c0c74fc97cf51f90555a11238332fe9406c Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Thu, 20 Jul 2023 10:08:03 +0100 Subject: IVGCVSW-7850 block non const bias on NEON Depthwise conv. * There's currently a problem with using a non const bias value in NeonDepthwiseConvolution. We will block it for the moment. Signed-off-by: Colm Donelan Change-Id: Ifd206cfd25a2305a80f8b0a88e07747e79468d18 --- src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp index ca8245cf4c..aa1fb563ff 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp @@ -62,6 +62,12 @@ arm_compute::Status NeonDepthwiseConvolutionWorkloadValidate(const TensorInfo& i return arm_compute::Status{arm_compute::ErrorCode::RUNTIME_ERROR, "ArmNN NeonDepthwiseConvolutionWorkload has empty bias value."}; } + // There's currently a problem with non const bias, so we'll explicitly block it here. + if (!biases.value().IsConstant()) + { + return arm_compute::Status{arm_compute::ErrorCode::RUNTIME_ERROR, + "ArmNN NeonDepthwiseConvolutionWorkload does not support non constant bias."}; + } aclBiasesInfo = BuildArmComputeTensorInfo(biases.value(), descriptor.m_DataLayout); aclBiasesInfo.set_are_values_constant(biases.value().IsConstant()); optionalAclBiasesInfo = &aclBiasesInfo; @@ -98,6 +104,8 @@ NeonDepthwiseConvolutionWorkload::NeonDepthwiseConvolutionWorkload( { biasesPtr = &PolymorphicDowncast(m_Data.m_Inputs[2])->GetTensor(); biasesPtr->info()->set_are_values_constant(info.m_InputTensorInfos[2].IsConstant()); + // We assume here that NeonDepthwiseConvolutionWorkloadValidate has been called before the constructor. + ARMNN_ASSERT(info.m_InputTensorInfos[2].IsConstant() == true); } arm_compute::TensorShape weightsShape = weights.info()->tensor_shape(); -- cgit v1.2.1