commit c23b633fed59e7432ab82dc21c9e95acb4ab6558
author Giorgio Arena <giorgio.arena@arm.com> Tue Nov 28 15:23:51 2017 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:41:17 2018 +0000
tree 560937300d4b37123685730a8340c92b7ff0be06
parent 9f26b3e794228d0e2804e5f1f7fe887124e4e825

COMPMID-617 Add validation window to CLNormalizationLayer

Change-Id: Iada46e5656bd6d16e5d965e2d38df9e60d5785c7
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/110950
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

tests/validation/CL/NormalizationLayer.cpp

diff --git a/tests/validation/CL/NormalizationLayer.cpp b/tests/validation/CL/NormalizationLayer.cpp
index caf7e2a..2e6ff89 100644
--- a/tests/validation/CL/NormalizationLayer.cpp
+++ b/tests/validation/CL/NormalizationLayer.cpp
@@ -75,7 +75,8 @@
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Even normalization
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Non implemented IN_MAP_2D
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::QS8, 4), // Mismatching fixed point position
-                                                       TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0),
+                                                       TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0), // Window shrink
+                                                       TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32, 0),
                                                      }),
                framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F16, 0),
                                                        TensorInfo(TensorShape(27U, 11U, 2U), 1, DataType::F32, 0),
@@ -83,6 +84,7 @@
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0),
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::QS8, 3),
                                                        TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32, 0),
+                                                       TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32, 0),
                                                      })),
                framework::dataset::make("NormInfo",  { NormalizationLayerInfo(NormType::IN_MAP_1D, 5),
                                                        NormalizationLayerInfo(NormType::IN_MAP_1D, 5),
@@ -90,11 +92,12 @@
                                                        NormalizationLayerInfo(NormType::IN_MAP_2D, 5),
                                                        NormalizationLayerInfo(NormType::IN_MAP_1D, 5),
                                                        NormalizationLayerInfo(NormType::IN_MAP_1D, 5),
+                                                       NormalizationLayerInfo(NormType::CROSS_MAP, 5),
                                                       })),
-               framework::dataset::make("Expected", { true, true, true, true, true, false })),
+               framework::dataset::make("Expected", { true, true, true, true, true, true, false })),
                input_info, output_info, norm_info, expected)
 {
-    ARM_COMPUTE_EXPECT(bool(CLNormalizationLayer::validate(&input_info, &output_info, norm_info)) == expected, framework::LogLevel::ERRORS);
+    ARM_COMPUTE_EXPECT(bool(CLNormalizationLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), norm_info)) == expected, framework::LogLevel::ERRORS);
 }
 // clang-format on
 // *INDENT-ON*