diff options
author | Cathal Corbett <cathal.corbett@arm.com> | 2021-12-15 17:12:59 +0000 |
---|---|---|
committer | Cathal Corbett <cathal.corbett@arm.com> | 2021-12-23 13:21:22 +0000 |
commit | cbfd718464b8ac41f0338ae6565d8213d24c0a2a (patch) | |
tree | f26da835108a0ed52ac0ffc8f7ebec64827b5033 /src/armnn/Network.cpp | |
parent | 81edc6217f76953c0be4c47f3d005cf48772ccb7 (diff) | |
download | armnn-cbfd718464b8ac41f0338ae6565d8213d24c0a2a.tar.gz |
IVGCVSW-6632 OptimizationViews: has INetwork rather than Graph for holding layers
* Deprecate the GetGraph() function in OptimizationViews & remove/fix
occurances where OptimizationViews.GetGraph() is called.
* OptimizationViews has member INetworkPtr.
* OptimizationViews has GetINetwork() method.
* Unit test added to OptimizationViewsTests.cpp.
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ifc1e53f1c34d786502279631942f0472f401038e
Diffstat (limited to 'src/armnn/Network.cpp')
-rw-r--r-- | src/armnn/Network.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 3198c22d9f..c0cfe426d2 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -215,10 +215,11 @@ IConnectableLayer* INetwork::AddPooling3dLayer(const Pooling3dDescriptor& poolin } IConnectableLayer* INetwork::AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, - CompiledBlobPtr& compiledBlobPtr, - const Optional<BackendId>& backend) + CompiledBlobPtr& compiledBlobPtr, + const Optional<BackendId>& backend, + const char* name) { - return pNetworkImpl->AddPrecompiledLayer(preCompiledDescriptor, compiledBlobPtr, backend); + return pNetworkImpl->AddPrecompiledLayer(preCompiledDescriptor, compiledBlobPtr, backend, name); } IConnectableLayer* INetwork::AddActivationLayer(const ActivationDescriptor& activationDescriptor, @@ -2772,10 +2773,19 @@ IConnectableLayer* NetworkImpl::AddUnidirectionalSequenceLstmLayer( IConnectableLayer* NetworkImpl::AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, CompiledBlobPtr& compiledBlobPtr, - const Optional<BackendId>& backend) + const Optional<BackendId>& backend, + const char* name) { // Method use is for backend users. - const auto layer = m_Graph->AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); + PreCompiledLayer* layer; + if (name) + { + layer = m_Graph->AddLayer<PreCompiledLayer>(preCompiledDescriptor, name); + } + else + { + layer = m_Graph->AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); + } // Assign the pre-compiled object to layer // Pass only one compiled network, Arm NN does not handle multiple |