From e339bf681f13990c7db7c656b75c011e84c290a9 Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Tue, 10 Nov 2020 18:43:23 +0000 Subject: IVGCVSW-5396 TfLiteDelegate: Implement the Resize operators * Added resize biliniear and nearest neighbour operator support to the tflite delegate Signed-off-by: Jan Eilers Change-Id: Id0113d6b865ea282c6f4de55e8419a6244a35f0e --- delegate/src/test/ResizeTest.cpp | 134 +++++++++++++++++++++++ delegate/src/test/ResizeTestHelper.hpp | 192 +++++++++++++++++++++++++++++++++ delegate/src/test/TestUtils.hpp | 26 +++++ 3 files changed, 352 insertions(+) create mode 100644 delegate/src/test/ResizeTest.cpp create mode 100644 delegate/src/test/ResizeTestHelper.hpp create mode 100644 delegate/src/test/TestUtils.hpp (limited to 'delegate/src/test') diff --git a/delegate/src/test/ResizeTest.cpp b/delegate/src/test/ResizeTest.cpp new file mode 100644 index 0000000000..394ad6c7ae --- /dev/null +++ b/delegate/src/test/ResizeTest.cpp @@ -0,0 +1,134 @@ +// +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ResizeTestHelper.hpp" + +#include + +#include +#include +#include +#include +#include +#include + +#include + +namespace armnnDelegate +{ + +void ResizeBiliniarFloat32Test(std::vector& backends) +{ + // Set input data + std::vector input1Values + { + 0.0f, 1.0f, 2.0f, + 3.0f, 4.0f, 5.0f, + 6.0f, 7.0f, 8.0f + }; + const std::vector input2NewShape { 5, 5 }; + + // Calculate output data + std::vector expectedOutputValues + { + 0.0f, 0.6f, 1.2f, 1.8f, 2.0f, + 1.8f, 2.4f, 3.0f, 3.6f, 3.8f, + 3.6f, 4.2f, 4.8f, 5.4f, 5.6f, + 5.4f, 6.0f, 6.6f, 7.2f, 7.4f, + 6.0f, 6.6f, 7.2f, 7.8f, 8.0f + }; + + const std::vector input1Shape { 1, 3, 3, 1 }; + const std::vector input2Shape { 2 }; + const std::vector expectedOutputShape = input2NewShape; + + ResizeFP32TestImpl(tflite::BuiltinOperator_RESIZE_BILINEAR, + backends, + input1Values, + input1Shape, + input2NewShape, + input2Shape, + expectedOutputValues, + expectedOutputShape); +} + +void ResizeNearestNeighbourFloat32Test(std::vector& backends) +{ + // Set input data + std::vector input1Values { 1.0f, 2.0f, 3.0f, 4.0f } + ; + const std::vector input2NewShape { 1, 1 }; + + // Calculate output data + std::vector expectedOutputValues { 1.0f }; + + const std::vector input1Shape { 1, 2, 2, 1 }; + const std::vector input2Shape { 2 }; + const std::vector expectedOutputShape = input2NewShape; + + ResizeFP32TestImpl(tflite::BuiltinOperator_RESIZE_NEAREST_NEIGHBOR, + backends, + input1Values, + input1Shape, + input2NewShape, + input2Shape, + expectedOutputValues, + expectedOutputShape); +} + +TEST_SUITE("ResizeTests_GpuAccTests") +{ + +TEST_CASE ("Resize_Biliniar_Float32_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + ResizeBiliniarFloat32Test(backends); +} + +TEST_CASE ("Resize_NearestNeighbour_Float32_GpuAcc_Test") +{ + std::vector backends = { armnn::Compute::GpuAcc }; + ResizeNearestNeighbourFloat32Test(backends); +} + +} // TEST_SUITE("ResizeTests_GpuAccTests") + + +TEST_SUITE("ResizeTests_CpuAccTests") +{ + +TEST_CASE ("Resize_Biliniar_Float32_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + ResizeBiliniarFloat32Test(backends); +} + +TEST_CASE ("Resize_NearestNeighbour_Float32_CpuAcc_Test") +{ + std::vector backends = { armnn::Compute::CpuAcc }; + ResizeNearestNeighbourFloat32Test(backends); +} + +} // TEST_SUITE("ResizeTests_CpuAccTests") + + +TEST_SUITE("ResizeTests_CpuRefTests") +{ + +TEST_CASE ("Resize_Biliniar_Float32_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + ResizeBiliniarFloat32Test(backends); +} + +TEST_CASE ("Resize_NearestNeighbour_Float32_CpuRef_Test") +{ + std::vector backends = { armnn::Compute::CpuRef }; + ResizeNearestNeighbourFloat32Test(backends); +} + +} // TEST_SUITE("ResizeTests_CpuRefTests") + +} // namespace armnnDelegate diff --git a/delegate/src/test/ResizeTestHelper.hpp b/delegate/src/test/ResizeTestHelper.hpp new file mode 100644 index 0000000000..1e9d3bcb3b --- /dev/null +++ b/delegate/src/test/ResizeTestHelper.hpp @@ -0,0 +1,192 @@ +// +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "TestUtils.hpp" + +#include + +#include +#include +#include +#include +#include +#include + +#include + +namespace +{ + +std::vector CreateResizeTfLiteModel(tflite::BuiltinOperator operatorCode, + tflite::TensorType inputTensorType, + const std::vector & inputTensorShape, + const std::vector & sizeTensorData, + const std::vector & sizeTensorShape, + const std::vector & outputTensorShape) +{ + using namespace tflite; + flatbuffers::FlatBufferBuilder flatBufferBuilder; + + std::vector> buffers; + buffers.push_back(CreateBuffer(flatBufferBuilder, flatBufferBuilder.CreateVector({}))); + buffers.push_back(CreateBuffer(flatBufferBuilder, + flatBufferBuilder.CreateVector( + reinterpret_cast(sizeTensorData.data()), + sizeof(int32_t) * sizeTensorData.size()))); + + std::array, 3> tensors; + tensors[0] = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(inputTensorShape.data(), inputTensorShape.size()), + inputTensorType, + 0, + flatBufferBuilder.CreateString("input_tensor")); + + tensors[1] = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(sizeTensorShape.data(), + sizeTensorShape.size()), + TensorType_INT32, + 1, + flatBufferBuilder.CreateString("size_input_tensor")); + + tensors[2] = CreateTensor(flatBufferBuilder, + flatBufferBuilder.CreateVector(outputTensorShape.data(), + outputTensorShape.size()), + inputTensorType, + 0, + flatBufferBuilder.CreateString("output_tensor")); + + // Create Operator + tflite::BuiltinOptions operatorBuiltinOptionsType = tflite::BuiltinOptions_NONE; + flatbuffers::Offset operatorBuiltinOption = 0; + switch (operatorCode) + { + case BuiltinOperator_RESIZE_BILINEAR: + { + operatorBuiltinOption = CreateResizeBilinearOptions(flatBufferBuilder, false, false).Union(); + operatorBuiltinOptionsType = tflite::BuiltinOptions_ResizeBilinearOptions; + break; + } + case BuiltinOperator_RESIZE_NEAREST_NEIGHBOR: + { + operatorBuiltinOption = CreateResizeNearestNeighborOptions(flatBufferBuilder, false, false).Union(); + operatorBuiltinOptionsType = tflite::BuiltinOptions_ResizeNearestNeighborOptions; + break; + } + default: + break; + } + + const std::vector operatorInputs{{0, 1}}; + const std::vector operatorOutputs{{2}}; + flatbuffers::Offset resizeOperator = + CreateOperator(flatBufferBuilder, + 0, + flatBufferBuilder.CreateVector(operatorInputs.data(), operatorInputs.size()), + flatBufferBuilder.CreateVector(operatorOutputs.data(), operatorOutputs.size()), + operatorBuiltinOptionsType, + operatorBuiltinOption); + + const std::vector subgraphInputs{{0, 1}}; + const std::vector subgraphOutputs{{2}}; + 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(&resizeOperator, 1)); + + flatbuffers::Offset modelDescription = + flatBufferBuilder.CreateString("ArmnnDelegate: Resize Biliniar Operator Model"); + flatbuffers::Offset opCode = CreateOperatorCode(flatBufferBuilder, operatorCode); + + flatbuffers::Offset flatbufferModel = + CreateModel(flatBufferBuilder, + TFLITE_SCHEMA_VERSION, + flatBufferBuilder.CreateVector(&opCode, 1), + flatBufferBuilder.CreateVector(&subgraph, 1), + modelDescription, + flatBufferBuilder.CreateVector(buffers.data(), buffers.size())); + + flatBufferBuilder.Finish(flatbufferModel); + + return std::vector(flatBufferBuilder.GetBufferPointer(), + flatBufferBuilder.GetBufferPointer() + flatBufferBuilder.GetSize()); +} + +void ResizeFP32TestImpl(tflite::BuiltinOperator operatorCode, + std::vector& backends, + std::vector& input1Values, + std::vector input1Shape, + std::vector input2NewShape, + std::vector input2Shape, + std::vector& expectedOutputValues, + std::vector expectedOutputShape) +{ + using namespace tflite; + + std::vector modelBuffer = CreateResizeTfLiteModel(operatorCode, + ::tflite::TensorType_FLOAT32, + input1Shape, + input2NewShape, + input2Shape, + expectedOutputShape); + + const Model* tfLiteModel = GetModel(modelBuffer.data()); + + // The model will be executed using tflite and using the armnn delegate so that the outputs + // can be compared. + + // Create TfLite Interpreter with armnn delegate + std::unique_ptr armnnDelegateInterpreter; + CHECK(InterpreterBuilder(tfLiteModel, ::tflite::ops::builtin::BuiltinOpResolver()) + (&armnnDelegateInterpreter) == kTfLiteOk); + CHECK(armnnDelegateInterpreter != nullptr); + CHECK(armnnDelegateInterpreter->AllocateTensors() == kTfLiteOk); + + // Create TfLite Interpreter without armnn delegate + std::unique_ptr tfLiteInterpreter; + CHECK(InterpreterBuilder(tfLiteModel, ::tflite::ops::builtin::BuiltinOpResolver()) + (&tfLiteInterpreter) == kTfLiteOk); + CHECK(tfLiteInterpreter != nullptr); + CHECK(tfLiteInterpreter->AllocateTensors() == kTfLiteOk); + + // Create the ArmNN Delegate + armnnDelegate::DelegateOptions delegateOptions(backends); + std::unique_ptr + theArmnnDelegate(armnnDelegate::TfLiteArmnnDelegateCreate(delegateOptions), + armnnDelegate::TfLiteArmnnDelegateDelete); + CHECK(theArmnnDelegate != nullptr); + // Modify armnnDelegateInterpreter to use armnnDelegate + CHECK(armnnDelegateInterpreter->ModifyGraphWithDelegate(theArmnnDelegate.get()) == kTfLiteOk); + + // Set input data for the armnn interpreter + armnnDelegate::FillInput(armnnDelegateInterpreter, 0, input1Values); + armnnDelegate::FillInput(armnnDelegateInterpreter, 1, input2NewShape); + + // Set input data for the tflite interpreter + armnnDelegate::FillInput(tfLiteInterpreter, 0, input1Values); + armnnDelegate::FillInput(tfLiteInterpreter, 1, input2NewShape); + + // Run EnqueWorkload + CHECK(armnnDelegateInterpreter->Invoke() == kTfLiteOk); + CHECK(tfLiteInterpreter->Invoke() == kTfLiteOk); + + // Compare output data + auto tfLiteDelegateOutputId = tfLiteInterpreter->outputs()[0]; + auto tfLiteDelageOutputData = tfLiteInterpreter->typed_tensor(tfLiteDelegateOutputId); + auto armnnDelegateOutputId = armnnDelegateInterpreter->outputs()[0]; + auto armnnDelegateOutputData = armnnDelegateInterpreter->typed_tensor(armnnDelegateOutputId); + for (size_t i = 0; i < expectedOutputValues.size(); i++) + { + CHECK(expectedOutputValues[i] == doctest::Approx(armnnDelegateOutputData[i])); + CHECK(armnnDelegateOutputData[i] == doctest::Approx(tfLiteDelageOutputData[i])); + } + + armnnDelegateInterpreter.reset(nullptr); +} + +} // anonymous namespace \ No newline at end of file diff --git a/delegate/src/test/TestUtils.hpp b/delegate/src/test/TestUtils.hpp new file mode 100644 index 0000000000..162d62f3bb --- /dev/null +++ b/delegate/src/test/TestUtils.hpp @@ -0,0 +1,26 @@ +// +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include + +namespace armnnDelegate +{ + +/// Can be used to assign input data from a vector to a model input. +/// Example usage can be found in ResizeTesthelper.hpp +template +void FillInput(std::unique_ptr& interpreter, int inputIndex, std::vector& inputValues) +{ + auto tfLiteDelegateInputId = interpreter->inputs()[inputIndex]; + auto tfLiteDelageInputData = interpreter->typed_tensor(tfLiteDelegateInputId); + for (unsigned int i = 0; i < inputValues.size(); ++i) + { + tfLiteDelageInputData[i] = inputValues[i]; + } +} + +} // namespace armnnDelegate -- cgit v1.2.1