diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-09-28 14:14:12 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:57 +0100 |
| commit | bcd3c85b5a7657b38f503676b88a80ae74165acd (patch) | |
| tree | a1f4f934aea17f0faa30f64b9eec0108bbe09ad3 /src/backends/ClWorkloads | |
| parent | e1fa50c70c647e3ba6dec0eb49ce82a3820fb6bb (diff) | |
| download | armnn-bcd3c85b5a7657b38f503676b88a80ae74165acd.tar.gz | |
IVGCVSW-1863 Support NHWC for L2Normalization
* Added L2NormalizationDescriptor struct with m_DataLyaout member
* Updated all IsL2NormalizationSupported calls to take a descriptor
as an argument
* Updated L2NormalizationLayer to take a descriptor as an argument
!android-nn-driver:150116
Change-Id: I0459352d19cfd269bc864a70cf73910bf44fdc01
Diffstat (limited to 'src/backends/ClWorkloads')
| -rw-r--r-- | src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp | 7 | ||||
| -rw-r--r-- | src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp index 8f5ed5feca..0ca334348e 100644 --- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.cpp @@ -15,10 +15,11 @@ namespace armnn using namespace armcomputetensorutils; arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, - const TensorInfo& output) + const TensorInfo& output, + const L2NormalizationDescriptor& descriptor) { - const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input); - const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output); + const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input, descriptor.m_DataLayout); + const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output, descriptor.m_DataLayout); arm_compute::NormalizationLayerInfo normalizationInfo = CreateAclNormalizationLayerInfoForL2Normalization(input); diff --git a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp index f3f7de110a..20c0426208 100644 --- a/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp +++ b/src/backends/ClWorkloads/ClL2NormalizationFloatWorkload.hpp @@ -13,7 +13,8 @@ namespace armnn { arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, - const TensorInfo& output); + const TensorInfo& output, + const L2NormalizationDescriptor& descriptor); class ClL2NormalizationFloatWorkload : public FloatWorkload<L2NormalizationQueueDescriptor> { |