From cecb0a75a9de0a12d30f8fabbe16a656c722afa1 Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Tue, 17 Sep 2019 08:59:09 +0100 Subject: COMPMID-2637 [CL] fix broadcast pixel-wise multiplication with 5D tensors Broadcast pixel-wise multiplication with 5D tensors is fixed by adding information whether a dimension has been broadcasted to compute correct start offset when adding 3D tensor argument. The testcase that failed is added to the validation test suite. Change-Id: I320876f507012c27b39daae1316f9b69138ed204 Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/1994 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Georgios Pinitas --- tests/datasets/ShapeDatasets.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/datasets/ShapeDatasets.h b/tests/datasets/ShapeDatasets.h index 07ecf45d81..b479eb4953 100644 --- a/tests/datasets/ShapeDatasets.h +++ b/tests/datasets/ShapeDatasets.h @@ -203,7 +203,9 @@ public: TensorShape{ 128U, 1U, 5U, 3U }, TensorShape{ 9U, 9U, 3U, 4U }, TensorShape{ 27U, 13U, 2U, 4U }, - TensorShape{ 1U, 1U, 1U, 5U } + TensorShape{ 1U, 1U, 1U, 5U }, + TensorShape{ 1U, 16U, 10U, 2U, 128U }, + TensorShape{ 1U, 16U, 10U, 2U, 128U } }), ShapeDataset("Shape1", { @@ -212,7 +214,9 @@ public: TensorShape{ 128U, 64U, 1U, 3U }, TensorShape{ 9U, 1U, 3U }, TensorShape{ 1U }, - TensorShape{ 9U, 9U, 3U, 5U } + TensorShape{ 9U, 9U, 3U, 5U }, + TensorShape{ 1U, 1U, 1U, 1U, 128U }, + TensorShape{ 128U } })) { } @@ -686,7 +690,7 @@ public: : ShapeDataset("InputShape", { // Batch size 1 - TensorShape{ 32U, 37U, 3U }, + TensorShape{ 32U, 37U, 3U }, // Batch size 4 TensorShape{ 32U, 37U, 3U, 4U }, }) @@ -702,7 +706,7 @@ public: : ShapeDataset("InputShape", { // Batch size 1 - TensorShape{ 32U, 37U, 3U }, + TensorShape{ 32U, 37U, 3U }, // Batch size 4 TensorShape{ 32U, 37U, 3U, 4U }, // Arbitrary batch size -- cgit v1.2.1