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/Layer.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/Layer.cpp')
| -rw-r--r-- | src/armnn/Layer.cpp | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index 3ccce40a19..8d4811ae89 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.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 "Layer.hpp" @@ -314,7 +314,7 @@ DataType Layer::GetDataType() const { if (GetNumInputSlots() > 0) // Ignore the input layer. { - return GetInputSlot(0).GetConnection()->GetTensorInfo().GetDataType(); + return GetInputSlot(0).GetTensorInfo().GetDataType(); } return GetOutputSlot(0).GetTensorInfo().GetDataType(); } @@ -571,4 +571,31 @@ IConnectableLayer& InputSlot::GetOwningIConnectableLayer() return m_OwningLayer; } +void InputSlot::SetTensorInfo(const TensorInfo tensorInfo) +{ + m_OverriddenTensorInfo = Optional<TensorInfo>(tensorInfo); +} + +const TensorInfo& InputSlot::GetTensorInfo() const +{ + if (m_OverriddenTensorInfo.has_value()) + { + return m_OverriddenTensorInfo.value(); + } + else + { + return GetConnection()->GetTensorInfo(); + } +} + +bool InputSlot::IsTensorInfoSet() const +{ + return m_OverriddenTensorInfo.has_value() || (GetConnection() && GetConnection()->IsTensorInfoSet()); +} + +bool InputSlot::IsTensorInfoOverridden() const +{ + return m_OverriddenTensorInfo.has_value(); +} + } // namespace armnn |