COMPMID-486 Add batch sizes 1, 4 and 8 to validation datasets
Change-Id: Ife60d3b163ffc3fec7b4a6ba593218e3f1f35429
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/84634
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
diff --git a/tests/datasets_new/ShapeDatasets.h b/tests/datasets_new/ShapeDatasets.h
index f6cd3f2..a693be7 100644
--- a/tests/datasets_new/ShapeDatasets.h
+++ b/tests/datasets_new/ShapeDatasets.h
@@ -70,9 +70,16 @@
SmallShapes()
: ShapeDataset("Shape",
{
+ // Batch size 1
TensorShape{ 7U, 7U },
TensorShape{ 27U, 13U, 2U },
- TensorShape{ 128U, 64U, 1U, 3U }
+ TensorShape{ 128U, 64U, 1U, 3U },
+ // Batch size 4
+ TensorShape{ 7U, 7U, 4U },
+ TensorShape{ 27U, 13U, 2U, 4U },
+ TensorShape{ 128U, 64U, 1U, 3U, 4U },
+ // Arbitrary batch size
+ TensorShape{ 7U, 7U, 5U }
})
{
}
@@ -85,9 +92,20 @@
LargeShapes()
: ShapeDataset("Shape",
{
+ // Batch size 1
TensorShape{ 1920U, 1080U },
TensorShape{ 1245U, 652U, 1U, 3U },
- TensorShape{ 4160U, 3120U }
+ TensorShape{ 4160U, 3120U },
+ // Batch size 4
+ TensorShape{ 1920U, 1080U, 4U },
+ TensorShape{ 1245U, 652U, 1U, 3U, 4U },
+ TensorShape{ 4160U, 3120U, 4U },
+ // Batch size 8
+ TensorShape{ 1920U, 1080U, 8U },
+ TensorShape{ 1245U, 652U, 1U, 3U, 8U },
+ TensorShape{ 4160U, 3120U, 8U },
+ // Arbitrary batch size
+ TensorShape{ 1920U, 1080U, 5U },
})
{
}
@@ -115,9 +133,20 @@
SmallDirectConvolutionShapes()
: ShapeDataset("InputShape",
{
- TensorShape{ 5U, 5U, 3U, 2U, 4U, 5U },
+ // Batch size 1
+ TensorShape{ 5U, 5U, 3U },
TensorShape{ 32U, 37U, 3U },
- TensorShape{ 13U, 15U, 8U, 3U }
+ TensorShape{ 13U, 15U, 8U },
+ // Batch size 4
+ TensorShape{ 5U, 5U, 3U, 4U },
+ TensorShape{ 32U, 37U, 3U, 4U },
+ TensorShape{ 13U, 15U, 8U, 4U },
+ // Batch size 8
+ TensorShape{ 5U, 5U, 3U, 8U },
+ TensorShape{ 32U, 37U, 3U, 8U },
+ TensorShape{ 13U, 15U, 8U, 8U },
+ // Arbitrary batch size
+ TensorShape{ 32U, 37U, 3U, 8U }
})
{
}