diff options
| author | Ferran Balaguer <ferran.balaguer@arm.com> | 2019-06-18 16:46:00 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-06-27 08:57:15 +0000 |
| commit | 05bf054f40eb551ea76722163b6ed1a1fde7bbf0 (patch) | |
| tree | dc0984bd9811515ac8a8c1812a7d152157d2ffe0 | |
| parent | 610256fdfd9fc771b7213a9134c86c5988e77fdc (diff) | |
| download | armnn-05bf054f40eb551ea76722163b6ed1a1fde7bbf0.tar.gz | |
IVGCVSW-3287 Add L2Normalization epsilon CL workload support
Signed-off-by: Ferran Balaguer <ferran.balaguer@arm.com>
Change-Id: Ifb7d50ed43cd66e219b17369130f9091d4a668e7
| -rw-r--r-- | src/backends/cl/test/ClLayerTests.cpp | 3 | ||||
| -rw-r--r-- | src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index db6bd82a9a..37ba39fa7f 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -246,6 +246,9 @@ ARMNN_AUTO_TEST_CASE(L2Normalization2dNhwc, L2Normalization2dTest, armnn::DataLa ARMNN_AUTO_TEST_CASE(L2Normalization3dNhwc, L2Normalization3dTest, armnn::DataLayout::NHWC) ARMNN_AUTO_TEST_CASE(L2Normalization4dNhwc, L2Normalization4dTest, armnn::DataLayout::NHWC) +ARMNN_AUTO_TEST_CASE(L2NormalizationDefaultEpsilon, L2NormalizationDefaultEpsilonTest, armnn::DataLayout::NCHW) +ARMNN_AUTO_TEST_CASE(L2NormalizationNonDefaultEpsilon, L2NormalizationNonDefaultEpsilonTest, armnn::DataLayout::NCHW) + // Resize Bilinear - NCHW data layout ARMNN_AUTO_TEST_CASE(SimpleResizeBilinear, SimpleResizeBilinearTest<armnn::DataType::Float32>, armnn::DataLayout::NCHW) ARMNN_AUTO_TEST_CASE(ResizeBilinearNop, ResizeBilinearNopTest<armnn::DataType::Float32>, armnn::DataLayout::NCHW) diff --git a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp index 6ba7ccd8c7..e1a61277d5 100644 --- a/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClL2NormalizationFloatWorkload.cpp @@ -23,7 +23,7 @@ arm_compute::Status ClL2NormalizationWorkloadValidate(const TensorInfo& input, int axis = (descriptor.m_DataLayout == DataLayout::NCHW) ? 2 : 0; - return arm_compute::CLL2NormalizeLayer::validate(&aclInput, &aclOutput, axis); + return arm_compute::CLL2NormalizeLayer::validate(&aclInput, &aclOutput, axis, descriptor.m_Eps); } ClL2NormalizationFloatWorkload::ClL2NormalizationFloatWorkload(const L2NormalizationQueueDescriptor& descriptor, @@ -41,7 +41,7 @@ ClL2NormalizationFloatWorkload::ClL2NormalizationFloatWorkload(const L2Normaliza int axis = (m_Data.m_Parameters.m_DataLayout == DataLayout::NCHW) ? 2 : 0; - m_Layer.configure(&input, &output, axis); + m_Layer.configure(&input, &output, axis, m_Data.m_Parameters.m_Eps); } void ClL2NormalizationFloatWorkload::Execute() const |