diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-10-18 08:45:39 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
commit | 8e6f92d2d6b2bb94e6ba9b794c08e465039ea98b (patch) | |
tree | 3e4c9e40108152de33c88ad53668bb10416a6a2e /src/backends/test | |
parent | 8eb675eb77865b5d2491f5b2d650ce993cab738c (diff) | |
download | armnn-8e6f92d2d6b2bb94e6ba9b794c08e465039ea98b.tar.gz |
IVGCVSW-2032 + IVGCVSW-2033 Add NHWC implementation to the reference
Normalization workload
* Enabled NHWC support in RefNormalizationFloat32Workload for
Across normalization
* Added unit test for the reference implementation
Change-Id: I0e1f319e76491d43b83b121c273fadb5b259d1a0
Diffstat (limited to 'src/backends/test')
-rwxr-xr-x | src/backends/test/LayerTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/test/NormTestImpl.hpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp index 1faacacb5c..726cb7d26b 100755 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/test/LayerTests.cpp @@ -694,7 +694,7 @@ LayerTestResult<float,4> SimpleNormalizationAcrossNhwcTest(armnn::IWorkloadFacto { auto normMethod = armnn::NormalizationAlgorithmMethod::LocalBrightness; auto normChannel = armnn::NormalizationAlgorithmChannel::Across; - return SimpleNormalizationNhwcClNeonTestImpl(workloadFactory, normChannel, normMethod); + return SimpleNormalizationNhwcTestImpl(workloadFactory, normChannel, normMethod); } LayerTestResult<float,2> SimpleSoftmaxTest(armnn::IWorkloadFactory& workloadFactory, float beta) diff --git a/src/backends/test/NormTestImpl.hpp b/src/backends/test/NormTestImpl.hpp index 300eeceae0..f4e6aea008 100644 --- a/src/backends/test/NormTestImpl.hpp +++ b/src/backends/test/NormTestImpl.hpp @@ -152,11 +152,9 @@ LayerTestResult<float,4> SimpleNormalizationTestImpl(armnn::IWorkloadFactory& wo return ret; } -// This is test implementation for CL and NEON, -// as currently, only Across Normalization is supported on CL and NEON for NHWC. -LayerTestResult<float,4> SimpleNormalizationNhwcClNeonTestImpl(armnn::IWorkloadFactory& workloadFactory, - armnn::NormalizationAlgorithmChannel normChannel, - armnn::NormalizationAlgorithmMethod normMethod) +LayerTestResult<float,4> SimpleNormalizationNhwcTestImpl(armnn::IWorkloadFactory& workloadFactory, + armnn::NormalizationAlgorithmChannel normChannel, + armnn::NormalizationAlgorithmMethod normMethod) { const unsigned int inputHeight = 2; const unsigned int inputWidth = 2; |