diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2022-10-28 18:02:17 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2022-11-02 15:08:37 +0000 |
commit | 164bf4f29f6f1b2a3e6714ef4f5a21fc0fd16c2b (patch) | |
tree | e7296130a787578e1be4d3a93de46a9c466944b4 /src/backends/tosaCommon/TosaMappings.hpp | |
parent | 2e950f4fa774ac995230addea898f3b11bf146cc (diff) | |
download | armnn-164bf4f29f6f1b2a3e6714ef4f5a21fc0fd16c2b.tar.gz |
IVGCVSW-7164 Implement TosaRefBackend::OptimizeSubgraphView
* Added TosaRefBackend::OptimizeSubgraphView implementation.
* Generalised TosaRefLayerSupport::IsLayerSupported to work with any
operator.
* Changed TosaCommon.hpp utils to inline functions.
* Added source files for TosaMappings.hpp and AdditionOperator.hpp.
* Fixed multiple defines issue with HALF_ROUND_STYLE and
HALF_ROUND_TIES_TO_EVEN.
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ib2576ec3fb97faa3a2256b2fb93ec16ac8745760
Diffstat (limited to 'src/backends/tosaCommon/TosaMappings.hpp')
-rw-r--r-- | src/backends/tosaCommon/TosaMappings.hpp | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/src/backends/tosaCommon/TosaMappings.hpp b/src/backends/tosaCommon/TosaMappings.hpp index 5728ff3203..c721bcaf59 100644 --- a/src/backends/tosaCommon/TosaMappings.hpp +++ b/src/backends/tosaCommon/TosaMappings.hpp @@ -15,20 +15,7 @@ using namespace tosa; // From the input armnn::Layer, set the corresponding data field in the // tosa::TosaSerializationTensor where constant tensor data exists in the armnn::Layer. -void SetBasicBlockConstantTensorData(Layer* layer, TosaSerializationBasicBlock* /*basicBlock*/) -{ - switch (layer->GetType()) - { - case LayerType::Convolution2d: - { - // ToDo: using Convolution2d as an example as it has constant tensors for weights and bias. - // ToDo: manually set TosaOperator data of basicBlock where constant tensors exist. - } - default: - // If no switch statement for layer, no constant tensors exist in that layer, return - return; - } -} +void SetBasicBlockConstantTensorData(Layer* layer, TosaSerializationBasicBlock* /*basicBlock*/); // Populates a tosa::TosaSerializationBasicBlock from constructing // tosa::TosaSerializationOperator(s) and tosa::TosaSerializationTensor(s) @@ -39,43 +26,8 @@ void SetBasicBlockConstantTensorData(Layer* layer, TosaSerializationBasicBlock* TosaSerializationBasicBlock* GetTosaMapping(const LayerType type, const std::vector<const TensorInfo*>& inputs, const std::vector<const TensorInfo*>& outputs, - const BaseDescriptor& /*descriptor*/) -{ - switch (type) - { - case LayerType::Addition: - { - return ConvertAdditionToTosaOperator(inputs, outputs); - } - default: - { - // empty basic block when no tosa mapping implemented/exists - TosaSerializationOperator* op = new TosaSerializationOperator(Op_UNKNOWN, Attribute_NONE, nullptr, {}, {}); - return new TosaSerializationBasicBlock("", {op}, {}, {}, {}); - } - } -} + const BaseDescriptor& /*descriptor*/); // Function called in armnn::OptimizeSubgraphView() when access to armnn::Layer is available // and there is an option to set tosa basic block data from constant layer tenors available from the input layer. -TosaSerializationBasicBlock* GetTosaMappingFromLayer(Layer* layer) -{ - std::vector<const TensorInfo*> inputs; - for (auto inputSlot : layer->GetInputSlots()) - { - inputs.push_back(&inputSlot.GetConnection()->GetTensorInfo()); - } - - std::vector<const TensorInfo*> outputs; - for (auto& outputSlot : layer->GetOutputSlots()) - { - outputs.push_back(&outputSlot.GetTensorInfo()); - } - - TosaSerializationBasicBlock* basicBlock = GetTosaMapping(layer->GetType(), - inputs, - outputs, - layer->GetParameters()); - SetBasicBlockConstantTensorData(layer, basicBlock); - return basicBlock; -} +TosaSerializationBasicBlock* GetTosaMappingFromLayer(Layer* layer); |