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/ClBatchNormalizationFloatWorkload.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/ClBatchNormalizationFloatWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp index c0f6cdfe6e..fa0be85100 100644 --- a/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClBatchNormalizationFloatWorkload.cpp @@ -23,20 +23,18 @@ arm_compute::Status ClBatchNormalizationValidate(const TensorInfo& input, const TensorInfo& gamma, const BatchNormalizationDescriptor &desc) { - const DataLayout dataLayout = desc.m_DataLayout.GetDataLayout(); - const arm_compute::TensorInfo aclInputInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(input, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(input, desc.m_DataLayout); const arm_compute::TensorInfo aclOutputInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(output, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(output, desc.m_DataLayout); const arm_compute::TensorInfo aclMeanInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(mean, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(mean, desc.m_DataLayout); const arm_compute::TensorInfo aclVarInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(var, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(var, desc.m_DataLayout); const arm_compute::TensorInfo aclBetaInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(beta, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(beta, desc.m_DataLayout); const arm_compute::TensorInfo aclGammaInfo = - armcomputetensorutils::BuildArmComputeTensorInfo(gamma, dataLayout); + armcomputetensorutils::BuildArmComputeTensorInfo(gamma, desc.m_DataLayout); return arm_compute::CLBatchNormalizationLayer::validate(&aclInputInfo, &aclOutputInfo, @@ -68,7 +66,7 @@ ClBatchNormalizationFloatWorkload::ClBatchNormalizationFloatWorkload( 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); |