From 663c1849b2c359e6d898a763fff2ef013b55a459 Mon Sep 17 00:00:00 2001 From: James Conroy Date: Fri, 1 Nov 2019 15:21:48 +0000 Subject: IVGCVSW-4051 Update ACL pin to 94e0cf960ea6116eb57fa88d9b951f859b52c602 * Add is_initalised() check to CLScheduler in ClContextControl. * Now use CLDepthwiseConvolutionLayer instead of CLDepthwiseConvolutionLayer3x3. * Now use NEDepthwiseConvolutionLayer instead of NEDepthwiseConvolutionLayerOptimized. !android-nn-driver:2212 Signed-off-by: James Conroy Change-Id: I509af65315a4322dc820a5cc1bbd36ed6999b4a7 --- .../workloads/NeonDepthwiseConvolutionWorkload.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp') diff --git a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp index 18085edab5..2093613513 100644 --- a/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp +++ b/src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp @@ -120,19 +120,19 @@ NeonDepthwiseConvolutionWorkload::NeonDepthwiseConvolutionWorkload( // Check for optimisation opportunities arm_compute::Status optimizationStatus = - arm_compute::NEDepthwiseConvolutionLayerOptimized::validate(inputInfo, - kernelInfo, - biasInfo, - outputInfo, - padStrideInfo, - depthMultiplier, - arm_compute::ActivationLayerInfo(), - aclDilationInfo); + arm_compute::NEDepthwiseConvolutionLayer::validate(inputInfo, + kernelInfo, + biasInfo, + outputInfo, + padStrideInfo, + depthMultiplier, + arm_compute::ActivationLayerInfo(), + aclDilationInfo); if (optimizationStatus.error_code() == arm_compute::ErrorCode::OK) { - m_pDepthwiseConvolutionLayer = std::make_unique(); - static_cast( + m_pDepthwiseConvolutionLayer = std::make_unique(); + static_cast( m_pDepthwiseConvolutionLayer.get())->configure(&input, m_KernelTensor.get(), m_BiasTensor.get(), -- cgit v1.2.1