From b30e6554ad41f21c8326e387aa2c1f8a5d4e6445 Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Wed, 7 Dec 2022 11:50:50 +0000 Subject: IVGCVSW-7174 Add Reshape support to TOSA Reference Backend * Spelling corrections and code refactors added to TosaCommon * TosaDTypeToString() implemented and used in TosaRef IsLayerSupported() instead of enum integer. * Using namespace armnn in TosaCommon OneToOneMappingTests and TosaReference TosaRefLayerSupportTests instead of armnn::ClassName. * Updated VerifyTosaAttribute() to also verify certain attributes from input and output shapes. Signed-off-by: Cathal Corbett Change-Id: I71dfca404d081a665f748ab724153c6dc36b7eca --- .../test/ReshapeEndToEndTestImpl.hpp | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 src/backends/backendsCommon/test/ReshapeEndToEndTestImpl.hpp (limited to 'src/backends/backendsCommon/test/ReshapeEndToEndTestImpl.hpp') diff --git a/src/backends/backendsCommon/test/ReshapeEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/ReshapeEndToEndTestImpl.hpp new file mode 100644 index 0000000000..4cefb6d352 --- /dev/null +++ b/src/backends/backendsCommon/test/ReshapeEndToEndTestImpl.hpp @@ -0,0 +1,91 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include + +#include +#include + +#include + +namespace +{ + +template +armnn::INetworkPtr CreateReshapeNetwork(const armnn::TensorShape& inputShape, + const armnn::TensorShape& outputShape, + const armnn::ReshapeDescriptor& descriptor, + const float qScale = 1.0f, + const int32_t qOffset = 0) +{ + using namespace armnn; + + INetworkPtr network(INetwork::Create()); + + TensorInfo inputTensorInfo(inputShape, DataType, qScale, qOffset, true); + TensorInfo outputTensorInfo(outputShape, DataType, qScale, qOffset); + + + IConnectableLayer* reshape = network->AddReshapeLayer(descriptor, "reshape"); + IConnectableLayer* input = network->AddInputLayer(0, "input"); + IConnectableLayer* output = network->AddOutputLayer(0, "output"); + + Connect(input, reshape, inputTensorInfo, 0, 0); + Connect(reshape, output, outputTensorInfo, 0, 0); + + return network; +} + +template> +void ReshapeEndToEnd(const std::vector& backends) +{ + using namespace armnn; + + const TensorShape& inputShape = { 2, 3 }; + const TensorShape& outputShape = { 6 }; + + ReshapeDescriptor descriptor; + descriptor.m_TargetShape = outputShape; + + INetworkPtr network = CreateReshapeNetwork(inputShape, outputShape, descriptor); + + CHECK(network); + + std::vector data{ 1, 2, 3, + 4, 5, 6 }; + + std::map> inputTensorData = { { 0, data } }; + std::map> expectedOutputData = { { 0, data } }; + + EndToEndLayerTestImpl(std::move(network), inputTensorData, expectedOutputData, backends); +} + +template +void ReshapeEndToEndFloat16(const std::vector& backends) +{ + using namespace armnn; + using namespace half_float::literal; + using Half = half_float::half; + + const TensorShape& inputShape = { 2, 3 }; + const TensorShape& outputShape = { 6 }; + + ReshapeDescriptor descriptor; + descriptor.m_TargetShape = outputShape; + + INetworkPtr network = CreateReshapeNetwork(inputShape, outputShape, descriptor); + CHECK(network); + + std::vector data{ 1._h, 2._h, 3._h, + 4._h, 5._h, 6._h }; + + std::map> inputTensorData = { { 0, data } }; + std::map> expectedOutputData = { { 0, data } }; + + EndToEndLayerTestImpl(std::move(network), inputTensorData, expectedOutputData, backends); +} + +} // anonymous namespace -- cgit v1.2.1