From 3504e425ac99467c80919768c4a1361c44b30353 Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Wed, 3 May 2023 13:53:02 +0100 Subject: IVGCVSW-7605 IVGCVSW-7604 Implement Squeeze and ExpandDims operators for Classic and Opaque Delegate * Implemented unsupported operators in Classic Delegate. * Added unit tests. Signed-off-by: Matthew Sloyan Change-Id: Ib39eeea53c114b15943e8dc2e796ce64c40cb3a5 --- delegate/test/ExpandDimsTest.cpp | 102 +++++++++++++++++++++ delegate/test/RedefineTestHelper.hpp | 166 ++++++++++++++++++++++++++++++++--- delegate/test/SqueezeTest.cpp | 102 +++++++++++++++++++++ 3 files changed, 360 insertions(+), 10 deletions(-) create mode 100644 delegate/test/ExpandDimsTest.cpp create mode 100644 delegate/test/SqueezeTest.cpp (limited to 'delegate/test') diff --git a/delegate/test/ExpandDimsTest.cpp b/delegate/test/ExpandDimsTest.cpp new file mode 100644 index 0000000000..8c21f731cc --- /dev/null +++ b/delegate/test/ExpandDimsTest.cpp @@ -0,0 +1,102 @@ +// +// Copyright © 2023 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RedefineTestHelper.hpp" + +namespace armnnDelegate +{ + +void ExpandDimsSimpleTest(std::vector& backends) +{ + // Set input data + std::vector inputShape { 2, 2, 1 }; + std::vector outputShape { 1, 2, 2, 1 }; + std::vector axis { 0 }; + + std::vector inputValues = { 1, 2, 3, 4 }; + std::vector expectedOutputValues = { 1, 2, 3, 4 }; + + RedefineTest(tflite::BuiltinOperator_EXPAND_DIMS, + ::tflite::TensorType_FLOAT32, + backends, + inputShape, + outputShape, + inputValues, + expectedOutputValues, + axis); +} + +void ExpandDimsWithNegativeAxisTest(std::vector& backends) +{ + // Set input data + std::vector inputShape { 1, 2, 2 }; + std::vector outputShape { 1, 2, 2, 1 }; + std::vector axis { -1 }; + + std::vector inputValues = { 1, 2, 3, 4 }; + std::vector expectedOutputValues = { 1, 2, 3, 4 }; + + RedefineTest(tflite::BuiltinOperator_EXPAND_DIMS, + ::tflite::TensorType_FLOAT32, + backends, + inputShape, + outputShape, + inputValues, + expectedOutputValues, + axis); +} + +TEST_SUITE("ExpandDims_GpuAccTests") +{ + +TEST_CASE ("ExpandDims_Simple_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + ExpandDimsSimpleTest(backends); +} + +TEST_CASE ("ExpandDims_With_Negative_Axis_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + ExpandDimsWithNegativeAxisTest(backends); +} + +} // TEST_SUITE("ExpandDims_GpuAccTests") + +TEST_SUITE("ExpandDims_CpuAccTests") +{ + +TEST_CASE ("ExpandDims_Simple_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + ExpandDimsSimpleTest(backends); +} + +TEST_CASE ("ExpandDims_With_Negative_Axis_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + ExpandDimsWithNegativeAxisTest(backends); +} + +} // TEST_SUITE("ExpandDims_CpuAccTests") + +TEST_SUITE("ExpandDims_CpuRefTests") +{ + +TEST_CASE ("ExpandDims_Simple_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + ExpandDimsSimpleTest(backends); +} + +TEST_CASE ("ExpandDims_With_Negative_Axis_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + ExpandDimsWithNegativeAxisTest(backends); +} + +} // TEST_SUITE("ExpandDims_CpuRefTests") + +} // namespace armnnDelegate \ No newline at end of file diff --git a/delegate/test/RedefineTestHelper.hpp b/delegate/test/RedefineTestHelper.hpp index 80631ccf8d..af9b446ae5 100644 --- a/delegate/test/RedefineTestHelper.hpp +++ b/delegate/test/RedefineTestHelper.hpp @@ -21,7 +21,7 @@ namespace { -std::vector CreateRedefineTfLiteModel( +std::vector CreateReshapeTfLiteModel( tflite::BuiltinOperator redefineOperatorCode, tflite::TensorType tensorType, const std::vector& inputTensorShape, @@ -141,6 +141,127 @@ std::vector CreateRedefineTfLiteModel( flatBufferBuilder.GetBufferPointer() + flatBufferBuilder.GetSize()); } +std::vector CreateRedefineTfLiteModel( + tflite::BuiltinOperator redefineOperatorCode, + tflite::TensorType tensorType, + const std::vector& inputTensorShape, + const std::vector& outputTensorShape, + const std::vector& squeezeOrAxisData, + float quantScale = 1.0f, + int quantOffset = 0) +{ + using namespace tflite; + flatbuffers::FlatBufferBuilder flatBufferBuilder; + std::vector> buffers; + buffers.push_back(CreateBuffer(flatBufferBuilder)); + buffers.push_back(CreateBuffer(flatBufferBuilder)); + + auto quantizationParameters = + CreateQuantizationParameters(flatBufferBuilder, + 0, + 0, + flatBufferBuilder.CreateVector({ quantScale }), + flatBufferBuilder.CreateVector({ quantOffset })); + + auto inputTensor = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(inputTensorShape.data(), + inputTensorShape.size()), + tensorType, + 1, + flatBufferBuilder.CreateString("input"), + quantizationParameters); + + std::vector> tensors; + std::vector operatorInputs; + std::vector subgraphInputs; + flatbuffers::Offset operatorBuiltinOptions; + tflite::BuiltinOptions operatorBuiltinOptionsType = BuiltinOptions_SqueezeOptions; + + if (redefineOperatorCode == tflite::BuiltinOperator_SQUEEZE) + { + buffers.push_back(CreateBuffer(flatBufferBuilder)); + auto outputTensor = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(outputTensorShape.data(), + outputTensorShape.size()), + tensorType, + 2, + flatBufferBuilder.CreateString("output"), + quantizationParameters); + tensors = { inputTensor, outputTensor}; + operatorInputs = {0}; + subgraphInputs = {0}; + operatorBuiltinOptions = + CreateSqueezeOptions(flatBufferBuilder, + flatBufferBuilder.CreateVector(squeezeOrAxisData.data(), + squeezeOrAxisData.size())).Union(); + + operatorBuiltinOptionsType = BuiltinOptions_SqueezeOptions; + } + else if (redefineOperatorCode == tflite::BuiltinOperator_EXPAND_DIMS) + { + buffers.push_back( + CreateBuffer(flatBufferBuilder, + flatBufferBuilder.CreateVector(reinterpret_cast(squeezeOrAxisData.data()), + sizeof(int32_t) * squeezeOrAxisData.size()))); + auto shapeTensor = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector( { 1 } ), + tflite::TensorType_INT32, + 2, + flatBufferBuilder.CreateString("axis")); + + buffers.push_back(CreateBuffer(flatBufferBuilder)); + auto outputTensor = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(outputTensorShape.data(), + outputTensorShape.size()), + tensorType, + 3, + flatBufferBuilder.CreateString("output"), + quantizationParameters); + + tensors = { inputTensor, outputTensor, shapeTensor }; + operatorInputs = {0, 2}; + subgraphInputs = {0, 2}; + operatorBuiltinOptions = CreateExpandDimsOptions(flatBufferBuilder).Union(); + + operatorBuiltinOptionsType = BuiltinOptions_ExpandDimsOptions; + } + + const std::vector operatorOutputs{1}; + flatbuffers::Offset redefineOperator = + CreateOperator(flatBufferBuilder, + 0, + flatBufferBuilder.CreateVector(operatorInputs.data(), operatorInputs.size()), + flatBufferBuilder.CreateVector(operatorOutputs.data(), operatorOutputs.size()), + operatorBuiltinOptionsType, + operatorBuiltinOptions); + + const std::vector subgraphOutputs{1}; + flatbuffers::Offset subgraph = + CreateSubGraph(flatBufferBuilder, + flatBufferBuilder.CreateVector(tensors.data(), tensors.size()), + flatBufferBuilder.CreateVector(subgraphInputs.data(), subgraphInputs.size()), + flatBufferBuilder.CreateVector(subgraphOutputs.data(), subgraphOutputs.size()), + flatBufferBuilder.CreateVector(&redefineOperator, 1)); + + flatbuffers::Offset modelDescription = + flatBufferBuilder.CreateString("ArmnnDelegate: Redefine Operator Model"); + flatbuffers::Offset operatorCode = CreateOperatorCode(flatBufferBuilder, + redefineOperatorCode); + + flatbuffers::Offset flatbufferModel = + CreateModel(flatBufferBuilder, + TFLITE_SCHEMA_VERSION, + flatBufferBuilder.CreateVector(&operatorCode, 1), + flatBufferBuilder.CreateVector(&subgraph, 1), + modelDescription, + flatBufferBuilder.CreateVector(buffers.data(), buffers.size())); + + flatBufferBuilder.Finish(flatbufferModel, armnnDelegate::FILE_IDENTIFIER); + + return std::vector(flatBufferBuilder.GetBufferPointer(), + flatBufferBuilder.GetBufferPointer() + flatBufferBuilder.GetSize()); +} + template void RedefineTest(tflite::BuiltinOperator redefineOperatorCode, tflite::TensorType tensorType, @@ -149,20 +270,45 @@ void RedefineTest(tflite::BuiltinOperator redefineOperatorCode, std::vector& outputShape, std::vector& inputValues, std::vector& expectedOutputValues, - std::vector& targetShape, + std::vector& additionalData, bool useOption = true, float quantScale = 1.0f, int quantOffset = 0) { using namespace delegateTestInterpreter; - std::vector modelBuffer = CreateRedefineTfLiteModel(redefineOperatorCode, - tensorType, - inputShape, - outputShape, - targetShape, - useOption, - quantScale, - quantOffset); + + std::vector modelBuffer; + if (redefineOperatorCode == tflite::BuiltinOperator_EXPAND_DIMS) + { + modelBuffer = CreateRedefineTfLiteModel(redefineOperatorCode, + tensorType, + inputShape, + outputShape, + additionalData, + quantScale, + quantOffset); + } + else if (redefineOperatorCode == tflite::BuiltinOperator_RESHAPE) + { + modelBuffer = CreateReshapeTfLiteModel(redefineOperatorCode, + tensorType, + inputShape, + outputShape, + additionalData, + useOption, + quantScale, + quantOffset); + } + else if (redefineOperatorCode == tflite::BuiltinOperator_SQUEEZE) + { + modelBuffer = CreateRedefineTfLiteModel(redefineOperatorCode, + tensorType, + inputShape, + outputShape, + additionalData, + quantScale, + quantOffset); + } // Setup interpreter with just TFLite Runtime. auto tfLiteInterpreter = DelegateTestInterpreter(modelBuffer); diff --git a/delegate/test/SqueezeTest.cpp b/delegate/test/SqueezeTest.cpp new file mode 100644 index 0000000000..01122c95e6 --- /dev/null +++ b/delegate/test/SqueezeTest.cpp @@ -0,0 +1,102 @@ +// +// Copyright © 2023 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RedefineTestHelper.hpp" + +namespace armnnDelegate +{ + +void SqueezeSimpleTest(std::vector& backends) +{ + // Set input data + std::vector inputShape { 1, 2, 2, 1 }; + std::vector outputShape { 2, 2 }; + std::vector squeezeDims { }; + + std::vector inputValues = { 1, 2, 3, 4 }; + std::vector expectedOutputValues = { 1, 2, 3, 4 }; + + RedefineTest(tflite::BuiltinOperator_SQUEEZE, + ::tflite::TensorType_FLOAT32, + backends, + inputShape, + outputShape, + inputValues, + expectedOutputValues, + squeezeDims); +} + +void SqueezeWithDimsTest(std::vector& backends) +{ + // Set input data + std::vector inputShape { 1, 2, 2, 1 }; + std::vector outputShape { 1, 2, 2 }; + std::vector squeezeDims { -1 }; + + std::vector inputValues = { 1, 2, 3, 4 }; + std::vector expectedOutputValues = { 1, 2, 3, 4 }; + + RedefineTest(tflite::BuiltinOperator_SQUEEZE, + ::tflite::TensorType_FLOAT32, + backends, + inputShape, + outputShape, + inputValues, + expectedOutputValues, + squeezeDims); +} + +TEST_SUITE("Squeeze_GpuAccTests") +{ + +TEST_CASE ("Squeeze_Simple_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + SqueezeSimpleTest(backends); +} + +TEST_CASE ("Squeeze_With_Dims_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + SqueezeWithDimsTest(backends); +} + +} // TEST_SUITE("Squeeze_GpuAccTests") + +TEST_SUITE("Squeeze_CpuAccTests") +{ + +TEST_CASE ("Squeeze_Simple_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + SqueezeSimpleTest(backends); +} + +TEST_CASE ("Squeeze_With_Dims_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + SqueezeWithDimsTest(backends); +} + +} // TEST_SUITE("Squeeze_CpuAccTests") + +TEST_SUITE("Squeeze_CpuRefTests") +{ + +TEST_CASE ("Squeeze_Simple_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + SqueezeSimpleTest(backends); +} + +TEST_CASE ("Squeeze_With_Dims_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + SqueezeWithDimsTest(backends); +} + +} // TEST_SUITE("Squeeze_CpuRefTests") + +} // namespace armnnDelegate \ No newline at end of file -- cgit v1.2.1