diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2022-12-22 13:09:38 +0000 |
---|---|---|
committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-12-23 13:37:25 +0000 |
commit | 0bb096d9cd11bec1a890066064c8a28c4a4fd6ee (patch) | |
tree | f01cc42856da05e9e3f5af452979136afb045588 /src/backends/tosaCommon/operatorMappings | |
parent | 56fb21ee9fd51038505ef663ef5717df5945f385 (diff) | |
download | armnn-0bb096d9cd11bec1a890066064c8a28c4a4fd6ee.tar.gz |
IVGCVSW-7343 Add Transpose support to TOSA Reference Backend
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I11505f672349e1f04143edfdc2df8775f685372d
Diffstat (limited to 'src/backends/tosaCommon/operatorMappings')
4 files changed, 88 insertions, 0 deletions
diff --git a/src/backends/tosaCommon/operatorMappings/CMakeLists.txt b/src/backends/tosaCommon/operatorMappings/CMakeLists.txt index 6e897aaa8c..2ec052cd43 100644 --- a/src/backends/tosaCommon/operatorMappings/CMakeLists.txt +++ b/src/backends/tosaCommon/operatorMappings/CMakeLists.txt @@ -23,6 +23,8 @@ list(APPEND armnnTosaBackendOperators_sources TosaOperatorUtils.hpp TransposeConv2dOperator.hpp TransposeConv2dOperator.cpp + TransposeOperator.hpp + TransposeOperator.cpp ) add_library(armnnTosaBackendOperators OBJECT ${armnnTosaBackendOperators_sources}) diff --git a/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp b/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp index 7b117d8443..3f27371295 100644 --- a/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp +++ b/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp @@ -14,3 +14,4 @@ #include "ReshapeOperator.hpp" #include "SliceOperator.hpp" #include "TransposeConv2dOperator.hpp" +#include "TransposeOperator.hpp" diff --git a/src/backends/tosaCommon/operatorMappings/TransposeOperator.cpp b/src/backends/tosaCommon/operatorMappings/TransposeOperator.cpp new file mode 100644 index 0000000000..56178e428b --- /dev/null +++ b/src/backends/tosaCommon/operatorMappings/TransposeOperator.cpp @@ -0,0 +1,65 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "TransposeOperator.hpp" + +TosaSerializationBasicBlock* ConvertTransposeToTosaOperator(const Layer* layer, + const std::vector<const TensorInfo*>& inputs, + const std::vector<const TensorInfo*>& outputs, + const TransposeDescriptor* transposeDescriptor) +{ + std::string input0Name = std::string("input0_"); + std::string outputName = std::string("output0_"); + std::string blockName = std::string("Op_TRANSPOSE_block_") + GetUniqueTosaMappingID(); + + // If a layer is present then the block will be used for execution, so input and output names need to be determined + // using the previous and following layers so the graph is connected correctly. For validation this doesn't matter. + if(layer != nullptr) + { + // Get the layers connected to the input slot and determine unique tensor name. + Layer& connectedLayer0 = layer->GetInputSlot(0).GetConnectedOutputSlot()->GetOwningLayer(); + input0Name = GenerateUniqueName(connectedLayer0, 0); + + // Determine unique output tensor name. + outputName = GenerateUniqueOutputName(*layer, 0); + } + + std::vector<int32_t> mappings(transposeDescriptor->m_DimMappings.begin(), + transposeDescriptor->m_DimMappings.end()); + TosaTransposeAttribute attribute(mappings); + + auto* op = new TosaSerializationOperator(Op_TRANSPOSE, + Attribute_TransposeAttribute, + &attribute, + {input0Name}, + {outputName}); + + + std::vector<TosaSerializationTensor*> tensors; + + // Only add input tensors if connected layer is an input layer. + // As intermediate or constant tensors will be created separately. + // There also can't be duplicate tensor. + if(input0Name.find("input0_") != std::string::npos) + { + std::vector<int32_t> inputShape0 = GetTosaTensorShape(inputs[0]->GetShape()); + DType inputDType0 = ArmNNToDType(inputs[0]->GetDataType()); + + tensors.push_back(new TosaSerializationTensor(input0Name, inputShape0, inputDType0, {})); + } + + std::vector<int32_t> outputShape0 = GetTosaTensorShape(outputs[0]->GetShape()); + DType outputDType0 = ArmNNToDType(outputs[0]->GetDataType()); + + tensors.push_back(new TosaSerializationTensor(outputName, outputShape0, outputDType0, {})); + + // operatorInputNames/operatorOutputNames ends up being the same as + // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings + return new TosaSerializationBasicBlock(blockName, // name + {op}, // operators + tensors, // tensors + {input0Name}, // inputs + {outputName}); // outputs +}
\ No newline at end of file diff --git a/src/backends/tosaCommon/operatorMappings/TransposeOperator.hpp b/src/backends/tosaCommon/operatorMappings/TransposeOperator.hpp new file mode 100644 index 0000000000..3d1e2acd14 --- /dev/null +++ b/src/backends/tosaCommon/operatorMappings/TransposeOperator.hpp @@ -0,0 +1,20 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "TosaOperatorUtils.hpp" + +#include <Layer.hpp> + +#include <tosa_serialization_handler.h> + +using namespace armnn; +using namespace tosa; + +TosaSerializationBasicBlock* ConvertTransposeToTosaOperator(const Layer* layer, + const std::vector<const TensorInfo*>& inputs, + const std::vector<const TensorInfo*>& outputs, + const TransposeDescriptor* transposeDescriptor); |