From dba634fd6a66a9e033a1925b0b26c80b270bbf21 Mon Sep 17 00:00:00 2001 From: Matthew Jackson Date: Thu, 15 Aug 2019 15:14:18 +0100 Subject: IVGCVSW-3639 Add 5d tensor support * Increased MaxNumOfTensorDimensions and fixed issues related to its use * Fixed issues caused by assuming 5d tensors are invalid * Updated ArmComputeTensorUtils for 5d tensors * Added 5d tensor unit tests for add, mul, stack and reshape (needed by IVGCVSW-3527) Signed-off-by: Matthew Jackson Change-Id: I5bcd64942d0d04efcc6c5acb240ad4b88e010743 --- src/armnnTfLiteParser/test/InputOutputTensorNames.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/armnnTfLiteParser/test/InputOutputTensorNames.cpp') diff --git a/src/armnnTfLiteParser/test/InputOutputTensorNames.cpp b/src/armnnTfLiteParser/test/InputOutputTensorNames.cpp index d42ae2e438..d7a4371548 100644 --- a/src/armnnTfLiteParser/test/InputOutputTensorNames.cpp +++ b/src/armnnTfLiteParser/test/InputOutputTensorNames.cpp @@ -61,12 +61,12 @@ struct InvalidTensorsFixture : public ParserFlatbuffersFixture "operator_codes": [ ], "subgraphs": [{ "tensors": [ { - "shape": [ 1, 1, 1, 1, 1 ], + "shape": [ 1, 1, 1, 1, 1, 1 ], "type": "FLOAT32", "name": "In", "buffer": 0 }, { - "shape": [ 1, 1, 1, 1, 1 ], + "shape": [ 1, 1, 1, 1, 1, 1 ], "type": "FLOAT32", "name": "Out", "buffer": 1 @@ -81,6 +81,7 @@ struct InvalidTensorsFixture : public ParserFlatbuffersFixture BOOST_FIXTURE_TEST_CASE(InvalidTensorsThrowException, InvalidTensorsFixture) { // Tensor numDimensions must be less than or equal to MaxNumOfTensorDimensions + static_assert(armnn::MaxNumOfTensorDimensions == 5, "Please update InvalidTensorsFixture"); BOOST_CHECK_THROW(Setup(), armnn::InvalidArgumentException); } -- cgit v1.2.1