From db947e26cf40b7dd274be3741f4f5f9231c10cef Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Fri, 8 Feb 2019 18:52:21 -0200 Subject: Add batch-to-space-nd parser to tf-lite Change-Id: I1e210f88f19f38ab719008e119c8fed153a3dd95 Signed-off-by: Bruno Goncalves --- CMakeLists.txt | 1 + src/armnnTfLiteParser/TfLiteParser.cpp | 49 ++++++++ src/armnnTfLiteParser/TfLiteParser.hpp | 1 + src/armnnTfLiteParser/test/BatchToSpaceND.cpp | 170 ++++++++++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 src/armnnTfLiteParser/test/BatchToSpaceND.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 4455e6df21..c465fde2ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -542,6 +542,7 @@ if(BUILD_UNIT_TESTS) src/armnnTfLiteParser/test/Activations.cpp src/armnnTfLiteParser/test/Addition.cpp src/armnnTfLiteParser/test/AvgPool2D.cpp + src/armnnTfLiteParser/test/BatchToSpaceND.cpp src/armnnTfLiteParser/test/Concatenation.cpp src/armnnTfLiteParser/test/Constant.cpp src/armnnTfLiteParser/test/Conv2D.cpp diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index 4acd30805e..31aab029ab 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -419,6 +419,7 @@ TfLiteParser::TfLiteParser() { // register supported operators m_ParserFunctions[tflite::BuiltinOperator_AVERAGE_POOL_2D] = &TfLiteParser::ParseAveragePool2D; + m_ParserFunctions[tflite::BuiltinOperator_BATCH_TO_SPACE_ND] = &TfLiteParser::ParseBatchToSpaceND; m_ParserFunctions[tflite::BuiltinOperator_CONCATENATION] = &TfLiteParser::ParseConcatenation; m_ParserFunctions[tflite::BuiltinOperator_CONV_2D] = &TfLiteParser::ParseConv2D; m_ParserFunctions[tflite::BuiltinOperator_DEPTHWISE_CONV_2D] = &TfLiteParser::ParseDepthwiseConv2D; @@ -836,6 +837,54 @@ void TfLiteParser::ParseAveragePool2D(size_t subgraphIndex, size_t operatorIndex ParsePool(subgraphIndex, operatorIndex, PoolingAlgorithm::Average); } +void TfLiteParser::ParseBatchToSpaceND(size_t subgraphIndex, size_t operatorIndex) +{ + CHECK_MODEL(m_Model, subgraphIndex, operatorIndex); + + auto inputs = GetInputs(m_Model, subgraphIndex, operatorIndex); + CHECK_VALID_SIZE(inputs.size(), 3); + + auto outputs = GetOutputs(m_Model, subgraphIndex, operatorIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + armnn::TensorInfo blockShapeTensorInfo = ToTensorInfo(inputs[1]); + BufferRawPtr blockShapeBufferPtr = GetBuffer(m_Model, inputs[1]->buffer); + + armnn::TensorInfo cropsTensorInfo = ToTensorInfo(inputs[2]); + BufferRawPtr cropsBufferPtr = GetBuffer(m_Model, inputs[2]->buffer); + + std::vector blockShape(blockShapeTensorInfo.GetNumElements()); + ::memcpy(blockShape.data(), blockShapeBufferPtr->data.data(), blockShapeTensorInfo.GetNumBytes()); + + std::vector cropsVector(cropsTensorInfo.GetNumElements()); + ::memcpy(cropsVector.data(), cropsBufferPtr->data.data(), cropsTensorInfo.GetNumBytes()); + + size_t step = 2; + std::vector> crops; + for (unsigned int i = 0; i < cropsTensorInfo.GetNumElements() / step; ++i) + { + crops.emplace_back(cropsVector[i * step], cropsVector[i * step + 1]); + } + + armnn::BatchToSpaceNdDescriptor desc; + desc.m_BlockShape = blockShape; + desc.m_Crops = crops; + desc.m_DataLayout = armnn::DataLayout::NHWC; + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + + auto layerName = boost::str(boost::format("BatchToSpaceND:%1%:%2%") % subgraphIndex % operatorIndex); + IConnectableLayer* layer = m_Network->AddBatchToSpaceNdLayer(desc, layerName.c_str()); + + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + auto inputTensorIndexes = AsUnsignedVector(GetInputTensorIds(m_Model, subgraphIndex, operatorIndex)); + RegisterInputSlots(subgraphIndex, operatorIndex, layer, {inputTensorIndexes[0]}); + + auto outputTensorIndexes = AsUnsignedVector(GetOutputTensorIds(m_Model, subgraphIndex, operatorIndex)); + RegisterOutputSlots(subgraphIndex, operatorIndex, layer, {outputTensorIndexes[0]}); +} + void TfLiteParser::ParseMaxPool2D(size_t subgraphIndex, size_t operatorIndex) { ParsePool(subgraphIndex, operatorIndex, PoolingAlgorithm::Max); diff --git a/src/armnnTfLiteParser/TfLiteParser.hpp b/src/armnnTfLiteParser/TfLiteParser.hpp index 599923244e..ceca9e2c44 100644 --- a/src/armnnTfLiteParser/TfLiteParser.hpp +++ b/src/armnnTfLiteParser/TfLiteParser.hpp @@ -92,6 +92,7 @@ private: void ParseUnsupportedOperator(size_t subgraphIndex, size_t operatorIndex); void ParseActivation(size_t subgraphIndex, size_t operatorIndex, armnn::ActivationFunction activationType); void ParseAveragePool2D(size_t subgraphIndex, size_t operatorIndex); + void ParseBatchToSpaceND(size_t subgraphIndex, size_t operatorIndex); void ParseConcatenation(size_t subgraphIndex, size_t operatorIndex); void ParseConv2D(size_t subgraphIndex, size_t operatorIndex); void ParseDepthwiseConv2D(size_t subgraphIndex, size_t operatorIndex); diff --git a/src/armnnTfLiteParser/test/BatchToSpaceND.cpp b/src/armnnTfLiteParser/test/BatchToSpaceND.cpp new file mode 100644 index 0000000000..97f1828335 --- /dev/null +++ b/src/armnnTfLiteParser/test/BatchToSpaceND.cpp @@ -0,0 +1,170 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include +#include "ParserFlatbuffersFixture.hpp" +#include "../TfLiteParser.hpp" + +#include +#include + +BOOST_AUTO_TEST_SUITE(TensorflowLiteParser) + +struct BatchToSpaceNDFixture : public ParserFlatbuffersFixture +{ + explicit BatchToSpaceNDFixture(const std::string & inputShape, + const std::string & outputShape, + const std::string & blockShapeData, + const std::string & cropsData) + { + m_JsonString = R"( + { + "version": 3, + "operator_codes": [ { "builtin_code": "BATCH_TO_SPACE_ND" } ], + "subgraphs": [ { + "tensors": [ + { + "shape": )" + inputShape + R"(, + "type": "FLOAT32", + "buffer": 0, + "name": "inputTensor", + "quantization": { + "min": [ 0.0 ], + "max": [ 255.0 ], + "scale": [ 1.0 ], + "zero_point": [ 0 ], + } + }, + { + "shape": )" + outputShape + R"(, + "type": "FLOAT32", + "buffer": 1, + "name": "outputTensor", + "quantization": { + "min": [ 0.0 ], + "max": [ 255.0 ], + "scale": [ 1.0 ], + "zero_point": [ 0 ], + } + }, + { + "shape": [ 2 ], + "type": "INT32", + "buffer": 2, + "name": "blockShapeTensor", + "quantization": { + "min": [ 0.0 ], + "max": [ 255.0 ], + "scale": [ 1.0 ], + "zero_point": [ 0 ], + } + }, + { + "shape": [ 2, 2 ], + "type": "INT32", + "buffer": 3, + "name": "cropsTensor", + "quantization": { + "min": [ 0.0 ], + "max": [ 255.0 ], + "scale": [ 1.0 ], + "zero_point": [ 0 ], + } + } + ], + "inputs": [ 0 ], + "outputs": [ 1 ], + "operators": [ + { + "opcode_index": 0, + "inputs": [ 0, 2, 3 ], + "outputs": [ 1 ], + "custom_options_format": "FLEXBUFFERS" + } + ], + } ], + "buffers" : [ + { }, + { }, + { "data": )" + blockShapeData + R"(, }, + { "data": )" + cropsData + R"(, }, + ] + } + )"; + Setup(); + } +}; + +struct BatchToSpaceNDFixtureTest1 : public BatchToSpaceNDFixture +{ + BatchToSpaceNDFixtureTest1() : BatchToSpaceNDFixture("[ 4, 2, 2, 1 ]", + "[ 1, 4, 4, 1 ]", + "[ 2,0,0,0, 2,0,0,0 ]", + "[ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 ]") {} +}; + +BOOST_FIXTURE_TEST_CASE(BatchToSpaceNDTest1, BatchToSpaceNDFixtureTest1) +{ + RunTest<4, armnn::DataType::Float32> + (0, + {{ "inputTensor", { // Batch 0, Height 0, Width (2) x Channel (1) + 1.0f, 3.0f, + // Batch 0, Height 1, Width (2) x Channel (1) + 9.0f, 11.0f, + + // Batch 1, Height 0, Width (2) x Channel (1) + 2.0f, 4.0f, + // Batch 1, Height 1, Width (2) x Channel (1) + 10.0f, 12.0f, + + // Batch 2, Height 0, Width (2) x Channel (1) + 5.0f, 7.0f, + // Batch 2, Height 1, Width (2) x Channel (1) + 13.0f, 15.0f, + + // Batch 3, Height 0, Width (2) x Channel (3) + 6.0f, 8.0f, + // Batch 3, Height 1, Width (2) x Channel (1) + 14.0f, 16.0f }}}, + {{ "outputTensor", { 1.0f, 2.0f, 3.0f, 4.0f, + 5.0f, 6.0f, 7.0f, 8.0f, + 9.0f, 10.0f, 11.0f, 12.0f, + 13.0f, 14.0f, 15.0f, 16.0f }}}); +} + +struct BatchToSpaceNDFixtureTest2 : public BatchToSpaceNDFixture +{ + BatchToSpaceNDFixtureTest2() : BatchToSpaceNDFixture("[ 4, 1, 1, 1 ]", + "[ 1, 2, 2, 1 ]", + "[ 2,0,0,0, 2,0,0,0 ]", + "[ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 ]") {} +}; + +BOOST_FIXTURE_TEST_CASE(ParseBatchToSpaceNDTest2, BatchToSpaceNDFixtureTest2) +{ + RunTest<4, armnn::DataType::Float32> + (0, + {{ "inputTensor", { 1.0f, 2.0f, 3.0f, 4.0f }}}, + {{ "outputTensor", { // Batch 0, Height 0, Width (2) x Channel (1) + 1.0f, 2.0f, 3.0f, 4.0f }}}); +} + +struct BatchToSpaceNDFixtureTest3 : public BatchToSpaceNDFixture +{ + BatchToSpaceNDFixtureTest3() : BatchToSpaceNDFixture("[ 4, 1, 1, 3 ]", + "[ 1, 2, 2, 3 ]", + "[ 2,0,0,0, 2,0,0,0 ]", + "[ 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 ]") {} +}; + +BOOST_FIXTURE_TEST_CASE(ParseBatchToSpaceNDTest3, BatchToSpaceNDFixtureTest3) +{ + RunTest<4, armnn::DataType::Float32> + (0, + {{ "inputTensor", { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f }}}, + {{ "outputTensor", { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f }}}); +} + +BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1