diff options
author | Matthew Bentham <matthew.bentham@arm.com> | 2018-11-19 13:19:28 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-11-19 16:14:07 +0000 |
commit | 8800c00770ed14eb48045cfcf033d6b67595a126 (patch) | |
tree | 3bdbd3a97bfc21276a98a14aeae3e878c96c3121 /src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp | |
parent | 5cdda351b4e12c5299173ec6b0fc75a948bdcda0 (diff) | |
download | armnn-8800c00770ed14eb48045cfcf033d6b67595a126.tar.gz |
IVGCVSW-2169 Remove DataLayoutIndexed from public API
Change-Id: If8d8087d9d365e467d3ca9bf9c40d7219cb75cfd
Diffstat (limited to 'src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp')
-rw-r--r-- | src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index 74e40ecbf6..2226e09964 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -18,12 +18,10 @@ arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const L2NormalizationDescriptor& descriptor) { - const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, - descriptor.m_DataLayout.GetDataLayout()); - const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, - descriptor.m_DataLayout.GetDataLayout()); + const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout); + const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout); - unsigned int axis = (descriptor.m_DataLayout.GetDataLayout() == DataLayout::NCHW) ? 2 : 0; + unsigned int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0; return arm_compute::CLL2NormalizeLayer::validate(&aclInput, &aclOutput, axis); } @@ -37,11 +35,11 @@ ClL2NormalizationFloatWorkload::ClL2NormalizationFloatWorkload(const L2Normaliza 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.GetDataLayout()); + arm_compute::DataLayout aclDataLayout = ConvertDataLayout(m_Data.m_Parameters.m_DataLayout); input.info()->set_data_layout(aclDataLayout); output.info()->set_data_layout(aclDataLayout); - unsigned int axis = (m_Data.m_Parameters.m_DataLayout.GetDataLayout() == DataLayout::NCHW) ? 2 : 0; + unsigned int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0; m_Layer.configure(&input, &output, axis); } |