COMPMID-439 - Refactored NEQuantizationLayer and NEQuantizationLayer in order to support 3D input tensors

Change-Id: I03eac2108a30bed56d40dfd52e75577a35d492e0
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/85783
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/tests/datasets/ShapeDatasets.h b/tests/datasets/ShapeDatasets.h
index 4c449a7..806fc04 100644
--- a/tests/datasets/ShapeDatasets.h
+++ b/tests/datasets/ShapeDatasets.h
@@ -63,6 +63,36 @@
     }
 };
 
+/** Data set containing small 3D tensor shapes. */
+class Small3DShapes final : public ShapeDataset
+{
+public:
+    Small3DShapes()
+        : ShapeDataset("Shape",
+    {
+        TensorShape{ 7U, 7U, 5U },
+                     TensorShape{ 27U, 13U, 37U },
+                     TensorShape{ 128U, 64U, 21U }
+    })
+    {
+    }
+};
+
+/** Data set containing small 4D tensor shapes. */
+class Small4DShapes final : public ShapeDataset
+{
+public:
+    Small4DShapes()
+        : ShapeDataset("Shape",
+    {
+        TensorShape{ 7U, 7U, 5U, 3U },
+                     TensorShape{ 27U, 13U, 37U, 2U },
+                     TensorShape{ 128U, 64U, 21U, 3U }
+    })
+    {
+    }
+};
+
 /** Data set containing small tensor shapes. */
 class SmallShapes final : public ShapeDataset
 {
@@ -117,6 +147,36 @@
     }
 };
 
+/** Data set containing large 3D tensor shapes. */
+class Large3DShapes final : public ShapeDataset
+{
+public:
+    Large3DShapes()
+        : ShapeDataset("Shape",
+    {
+        TensorShape{ 320U, 240U, 3U },
+                     TensorShape{ 383U, 653U, 2U },
+                     TensorShape{ 721U, 123U, 13U }
+    })
+    {
+    }
+};
+
+/** Data set containing large 4D tensor shapes. */
+class Large4DShapes final : public ShapeDataset
+{
+public:
+    Large4DShapes()
+        : ShapeDataset("Shape",
+    {
+        TensorShape{ 320U, 123U, 3U, 3U },
+                     TensorShape{ 383U, 413U, 2U, 3U },
+                     TensorShape{ 517U, 123U, 13U, 2U }
+    })
+    {
+    }
+};
+
 /** Data set containing small tensor shapes for direct convolution. */
 class SmallDirectConvolutionShapes final : public ShapeDataset
 {