diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2023-06-30 15:18:26 +0100 |
|---|---|---|
| committer | mike.kelly <mike.kelly@arm.com> | 2023-07-03 15:32:04 +0000 |
| commit | a9ac6ba643e8dc4fee88bd0e7e186f0918080c4b (patch) | |
| tree | 4e05fbb098b30f3d2c7d3e5b4b83d48c9bdd59ac /src/armnn/layers/SplitterLayer.cpp | |
| parent | 6d2d4ead359aa02d502f15cfcb7e69c7658bd1ed (diff) | |
| download | armnn-a9ac6ba643e8dc4fee88bd0e7e186f0918080c4b.tar.gz | |
IVGCVSW-7828 Add an Optional TensorInfo to InputSlot
* Updated calls to use the new function
From:
GetInputSlot(n).GetConnection()->GetTensorInfo();
To:
GetInputSlot(n).GetTensorInfo();
* Added UnitTests
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I43184cc05e4472011b9347aaa820eb8deb1cd4a0
Diffstat (limited to 'src/armnn/layers/SplitterLayer.cpp')
| -rw-r--r-- | src/armnn/layers/SplitterLayer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 0226a046be..86a42305ff 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "SplitterLayer.hpp" @@ -131,11 +131,13 @@ void SplitterLayer::CreateTensors(const TensorHandleFactoryRegistry& registry, // 2) the same TensorHandleFactory is used for input and split layer output // 3) the output does not go to a Constant layer or input layer // 4) if split along x or y (2 innermost dimensions) and the next layers do not require padding + // 5) none of the outputs have an Overridden TensorInfo if (parentInfo.IsTypeSpaceMatch(info) && //(1) factoryId == slot->GetTensorHandleFactoryId() && //(2) GetOutputSlot(i).GetConnection(0)->GetOwningLayer().GetType() != LayerType::Constant && //(3) GetOutputSlot(i).GetConnection(0)->GetOwningLayer().GetType() != LayerType::Input && //(3) - canUseSubTensorOnXorY) //(4) + canUseSubTensorOnXorY && //(4) + !GetOutputSlot(i).GetConnection(0)->IsTensorInfoOverridden()) //(5) { ARMNN_NO_DEPRECATE_WARN_BEGIN return factory.CreateSubTensorHandle(*inputData, |