diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2022-10-14 11:20:07 +0100 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-10-14 14:58:27 +0000 |
| commit | fcc72f53c56683fe697ac23662c49af09048a428 (patch) | |
| tree | 92f903de70015a03e8748b0af160af34ceec4d22 /src/armnn | |
| parent | 16c76d5db629d3ef7e4cb143bfa7e1d717e1d492 (diff) | |
| download | armnn-fcc72f53c56683fe697ac23662c49af09048a428.tar.gz | |
IVGCVSW-7267 Make the AllowExpandedDims option work
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Change-Id: I3573078206272c3a72a2b3acf8781ab458ea6c90
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/Graph.hpp | 4 | ||||
| -rw-r--r-- | src/armnn/Network.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/Network.hpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/armnn/Graph.hpp b/src/armnn/Graph.hpp index 482d9277e8..1b87751e9b 100644 --- a/src/armnn/Graph.hpp +++ b/src/armnn/Graph.hpp @@ -119,12 +119,12 @@ public: m_LayersInOrder = std::move(other.m_LayersInOrder); m_Views = std::move(other.m_Views); m_Profiler = std::move(other.m_Profiler); + m_AllowExpandedDims = other.m_AllowExpandedDims; + m_ShapeInferenceMethod = other.m_ShapeInferenceMethod; other.ForEachLayer([this](Layer* otherLayer) { otherLayer->Reparent(*this, m_Layers.end()); }); - m_AllowExpandedDims = other.m_AllowExpandedDims; - m_ShapeInferenceMethod = other.m_ShapeInferenceMethod; ARMNN_ASSERT(other.m_PosInGraphMap.empty()); ARMNN_ASSERT(other.m_Layers.empty()); diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 5930805f11..1b1815f73d 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -442,12 +442,12 @@ void INetwork::ExecuteStrategy(IStrategy& strategy) const return pNetworkImpl->ExecuteStrategy(strategy); } -armnn::INetwork* INetwork::CreateRaw(NetworkOptions networkOptions) +armnn::INetwork* INetwork::CreateRaw(const NetworkOptions& networkOptions) { return new INetwork(networkOptions); } -armnn::INetworkPtr INetwork::Create(NetworkOptions networkOptions) +armnn::INetworkPtr INetwork::Create(const NetworkOptions& networkOptions) { return INetworkPtr(CreateRaw(networkOptions), &INetwork::Destroy); } @@ -1879,7 +1879,7 @@ bool NetworkImpl::GetAllowExpandedDims() return allowExpandedDims; } -NetworkImpl::NetworkImpl(NetworkOptions networkOptions) +NetworkImpl::NetworkImpl(const NetworkOptions& networkOptions) : m_NetworkOptions(networkOptions), m_Graph(std::make_unique<Graph>(GetShapeInferenceMethod(), GetAllowExpandedDims())) {} diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 8bd56d367b..5ca16e2968 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -31,7 +31,7 @@ using NetworkImplPtr = std::unique_ptr<NetworkImpl, void (*)(NetworkImpl* networ class NetworkImpl { public: - NetworkImpl(NetworkOptions networkOptions = {}); + NetworkImpl(const NetworkOptions& networkOptions = {}); ~NetworkImpl(); const Graph& GetGraph() const |