commit 4c600de5a45d5152bc19e4daf4e85c20705324c0
author Teresa Charlin <teresa.charlinreyes@arm.com> Thu Mar 11 21:59:43 2021 +0000
committer TeresaARM <teresa.charlinreyes@arm.com> Fri Mar 12 13:44:17 2021 +0000
tree 8292db5418c712f43ab63b05e3d1ffd05356daf7
parent 58fb0ee76104ee281efbace28f1edb0a764d5044

IVGCVSW-5772 L2 pooling missing from armnnDeserializer

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I59bf2eade949043d1f498772fad66eda7d64a87f

src/armnnDeserializer/test/DeserializePooling2d.cpp

diff --git a/src/armnnDeserializer/test/DeserializePooling2d.cpp b/src/armnnDeserializer/test/DeserializePooling2d.cpp
index 4d75740..bf7b8ae 100644
--- a/src/armnnDeserializer/test/DeserializePooling2d.cpp
+++ b/src/armnnDeserializer/test/DeserializePooling2d.cpp
@@ -108,7 +108,8 @@
 
 struct SimpleAvgPooling2dFixture : Pooling2dFixture
 {
-    SimpleAvgPooling2dFixture() : Pooling2dFixture("[ 1, 2, 2, 1 ]", "[ 1, 1, 1, 1 ]",
+    SimpleAvgPooling2dFixture() : Pooling2dFixture("[ 1, 2, 2, 1 ]",
+                                                   "[ 1, 1, 1, 1 ]",
                                                    "Float32", "NHWC", "Average") {}
 };
 
@@ -133,6 +134,13 @@
                                                     "QuantisedAsymm8", "NCHW", "Max") {}
 };
 
+struct SimpleL2Pooling2dFixture : Pooling2dFixture
+{
+    SimpleL2Pooling2dFixture() : Pooling2dFixture("[ 1, 2, 2, 1 ]",
+                                                  "[ 1, 1, 1, 1 ]",
+                                                  "Float32", "NHWC", "L2") {}
+};
+
 BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Avg, SimpleAvgPooling2dFixture)
 {
     RunTest<4, armnn::DataType::Float32>(0, { 2, 3, 5, 2 }, { 3 });
@@ -140,9 +148,7 @@
 
 BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Avg, SimpleAvgPooling2dFixture2)
 {
-    RunTest<4, armnn::DataType::QAsymmU8>(0,
-                                                { 20, 40, 60, 80 },
-                                                { 50 });
+    RunTest<4, armnn::DataType::QAsymmU8>(0,{ 20, 40, 60, 80 },{ 50 });
 }
 
 BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Max, SimpleMaxPooling2dFixture)
@@ -152,9 +158,12 @@
 
 BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Max, SimpleMaxPooling2dFixture2)
 {
-    RunTest<4, armnn::DataType::QAsymmU8>(0,
-                                                { 20, 40, 60, 80 },
-                                                { 80 });
+    RunTest<4, armnn::DataType::QAsymmU8>(0,{ 20, 40, 60, 80 },{ 80 });
+}
+
+BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32L2, SimpleL2Pooling2dFixture)
+{
+    RunTest<4, armnn::DataType::Float32>(0, { 2, 3, 5, 2 }, { 3.2403703f });
 }
 
 BOOST_AUTO_TEST_SUITE_END()