diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2018-10-05 14:08:48 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:58 +0100 |
commit | 043d0d0e07e0a29648894cb9ba68993e540bb94d (patch) | |
tree | 8f757c83d11ba0472f6b636f8ce8fa5b2f3e620e /src/backends/cl/workloads | |
parent | 7c22c70418192cf5803ae60dd2da041b0a6aafe5 (diff) | |
download | armnn-043d0d0e07e0a29648894cb9ba68993e540bb94d.tar.gz |
IVGCVSW-1860 Support NHWC for Pooling2D
Change-Id: I9059a292e47867df82a5efbba5808fd264949ec9
Diffstat (limited to 'src/backends/cl/workloads')
-rw-r--r-- | src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp b/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp index 98911856fe..e61ad4f28e 100644 --- a/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp +++ b/src/backends/cl/workloads/ClPooling2dBaseWorkload.cpp @@ -17,8 +17,8 @@ arm_compute::Status ClPooling2dWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const Pooling2dDescriptor& descriptor) { - const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input); - const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output); + const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout); + const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout); arm_compute::PoolingLayerInfo layerInfo = BuildArmComputePoolingLayerInfo(descriptor); @@ -35,6 +35,10 @@ ClPooling2dBaseWorkload<dataTypes...>::ClPooling2dBaseWorkload( arm_compute::ICLTensor& input = static_cast<IClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ICLTensor& output = static_cast<IClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); + input.info()->set_data_layout(aclDataLayout); + output.info()->set_data_layout(aclDataLayout); + arm_compute::PoolingLayerInfo layerInfo = BuildArmComputePoolingLayerInfo(m_Data.m_Parameters); // Run the layer. |