From 5008cb8b7c03ef113bf462b8c5883b8ec962711a Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Mon, 9 Oct 2023 10:28:59 +0100 Subject: Revert "IVGCVSW-7850 block non const bias on NEON Depthwise conv." This reverts commit 47016c0c74fc97cf51f90555a11238332fe9406c. Signed-off-by: Colm Donelan Change-Id: I40856ccb581bf60c8a72ecac4cfe7375cbf4b286 --- src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp index 53f7ee315e..b9e9ebb785 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp @@ -62,12 +62,6 @@ 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; @@ -104,8 +98,6 @@ 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