diff options
| author | James Conroy <james.conroy@arm.com> | 2019-11-01 15:21:48 +0000 |
|---|---|---|
| committer | James Conroy <james.conroy@arm.com> | 2019-11-12 18:51:20 +0000 |
| commit | 663c1849b2c359e6d898a763fff2ef013b55a459 (patch) | |
| tree | b6212f72e8ca4175d5f0a93210220807460cb727 /src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp | |
| parent | d8df0260ced49a2796ff70e96284cf00eb316bcc (diff) | |
| download | armnn-663c1849b2c359e6d898a763fff2ef013b55a459.tar.gz | |
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 <james.conroy@arm.com>
Change-Id: I509af65315a4322dc820a5cc1bbd36ed6999b4a7
Diffstat (limited to 'src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp')
| -rw-r--r-- | src/backends/neon/workloads/NeonDepthwiseConvolutionWorkload.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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<arm_compute::NEDepthwiseConvolutionLayerOptimized>(); - static_cast<arm_compute::NEDepthwiseConvolutionLayerOptimized*>( + m_pDepthwiseConvolutionLayer = std::make_unique<arm_compute::NEDepthwiseConvolutionLayer>(); + static_cast<arm_compute::NEDepthwiseConvolutionLayer*>( m_pDepthwiseConvolutionLayer.get())->configure(&input, m_KernelTensor.get(), m_BiasTensor.get(), |