diff options
Diffstat (limited to 'src/backends/cl')
| -rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 3 | ||||
| -rw-r--r-- | src/backends/cl/workloads/ClPooling2dWorkload.cpp | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index b5fc031461..4f9989405d 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -712,7 +712,8 @@ static void ClResizeBilinearWorkloadTest(DataLayout dataLayout) BOOST_TEST(CompareIClTensorHandleShape(inputHandle, { 2, 4, 4, 3 })); BOOST_TEST(CompareIClTensorHandleShape(outputHandle, { 2, 2, 2, 3 })); break; - default: // NCHW + case DataLayout::NCHW: + default: BOOST_TEST(CompareIClTensorHandleShape(inputHandle, { 2, 3, 4, 4 })); BOOST_TEST(CompareIClTensorHandleShape(outputHandle, { 2, 3, 2, 2 })); } diff --git a/src/backends/cl/workloads/ClPooling2dWorkload.cpp b/src/backends/cl/workloads/ClPooling2dWorkload.cpp index 255f57341e..68512ff980 100644 --- a/src/backends/cl/workloads/ClPooling2dWorkload.cpp +++ b/src/backends/cl/workloads/ClPooling2dWorkload.cpp @@ -19,8 +19,10 @@ arm_compute::Status ClPooling2dWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const Pooling2dDescriptor& descriptor) { - const arm_compute::TensorInfo aclInputInfo = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout); - const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout); + const arm_compute::TensorInfo aclInputInfo = + BuildArmComputeTensorInfo(input, descriptor.m_DataLayout.GetDataLayout()); + const arm_compute::TensorInfo aclOutputInfo = + BuildArmComputeTensorInfo(output, descriptor.m_DataLayout.GetDataLayout()); arm_compute::PoolingLayerInfo layerInfo = BuildArmComputePoolingLayerInfo(descriptor); @@ -36,7 +38,7 @@ ClPooling2dWorkload::ClPooling2dWorkload( 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); + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout.GetDataLayout()); input.info()->set_data_layout(aclDataLayout); output.info()->set_data_layout(aclDataLayout); |