diff options
| author | Cathal Corbett <cathal.corbett@arm.com> | 2022-01-06 10:29:43 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-01-12 11:27:06 +0000 |
| commit | 3ea0107ce9971cea47ac6e318cc9affbd9b6a989 (patch) | |
| tree | 6e1f8835d0adcb07eaf2a53b46ab8ad78874011f | |
| parent | f4de234bb1196c4fb885e347ace25e3946c7b5c3 (diff) | |
| download | armnn-3ea0107ce9971cea47ac6e318cc9affbd9b6a989.tar.gz | |
Fix INetwork::AddPrecompiledLayer to take the CompiledBlobPtr by value rather than reference.
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: I4057d2d6055220bb0d415a934ac09688b699b77c
| -rw-r--r-- | include/armnn/INetwork.hpp | 2 | ||||
| -rw-r--r-- | src/armnn/Network.cpp | 6 | ||||
| -rw-r--r-- | src/armnn/Network.hpp | 2 | ||||
| -rw-r--r-- | src/armnn/test/SubgraphViewTests.cpp | 4 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/MockBackend.cpp | 2 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/OptimizationViewsTests.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index 3e607256ec..5d25665dfe 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -423,7 +423,7 @@ public: /// @param backend - optional BackendId set for the Precompiled layer. /// @return - Interface for configuring the layer. IConnectableLayer* AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, - CompiledBlobPtr& compiledBlobPtr, + CompiledBlobPtr compiledBlobPtr, const Optional<BackendId>& backend, const char* name = nullptr); diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index c0cfe426d2..e89c6fe407 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -215,11 +215,11 @@ IConnectableLayer* INetwork::AddPooling3dLayer(const Pooling3dDescriptor& poolin } IConnectableLayer* INetwork::AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, - CompiledBlobPtr& compiledBlobPtr, + CompiledBlobPtr compiledBlobPtr, const Optional<BackendId>& backend, const char* name) { - return pNetworkImpl->AddPrecompiledLayer(preCompiledDescriptor, compiledBlobPtr, backend, name); + return pNetworkImpl->AddPrecompiledLayer(preCompiledDescriptor, std::move(compiledBlobPtr), backend, name); } IConnectableLayer* INetwork::AddActivationLayer(const ActivationDescriptor& activationDescriptor, @@ -2772,7 +2772,7 @@ IConnectableLayer* NetworkImpl::AddUnidirectionalSequenceLstmLayer( } IConnectableLayer* NetworkImpl::AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, - CompiledBlobPtr& compiledBlobPtr, + CompiledBlobPtr compiledBlobPtr, const Optional<BackendId>& backend, const char* name) { diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index db9c374c3b..ee84d7b33b 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -171,7 +171,7 @@ public: const char* name = nullptr); IConnectableLayer* AddPrecompiledLayer(const PreCompiledDescriptor& preCompiledDescriptor, - CompiledBlobPtr& compiledBlobPtr, + CompiledBlobPtr compiledBlobPtr, const Optional<BackendId>& backend, const char* name = nullptr); diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp index 639e832b87..693daa2268 100644 --- a/src/armnn/test/SubgraphViewTests.cpp +++ b/src/armnn/test/SubgraphViewTests.cpp @@ -201,7 +201,7 @@ TEST_CASE("SingleInputSingleOutputAddPrecompiledLayerSubstituteSubgraph1") // Construct dummy pre-compiled layer INetworkPtr network = INetwork::Create(); IConnectableLayer* preCompiledLayer = network->AddPrecompiledLayer(preCompiledDescriptor, - compiledBlobPtr, + std::move(compiledBlobPtr), backend); // Substitute sub-graph with pre-compiled layer @@ -245,7 +245,7 @@ TEST_CASE("SingleInputSingleOutputAddPrecompiledLayerSubstituteSubgraph2") // Construct dummy pre-compiled layer INetworkPtr network = INetwork::Create(); IConnectableLayer* preCompiledLayer = network->AddPrecompiledLayer(preCompiledDescriptor, - compiledBlobPtr, + std::move(compiledBlobPtr), backend); SubgraphView substituteSubgraph(preCompiledLayer); diff --git a/src/backends/backendsCommon/test/MockBackend.cpp b/src/backends/backendsCommon/test/MockBackend.cpp index a34cfe98fe..d95cfc3a34 100644 --- a/src/backends/backendsCommon/test/MockBackend.cpp +++ b/src/backends/backendsCommon/test/MockBackend.cpp @@ -194,7 +194,7 @@ OptimizationViews MockBackend::OptimizeSubgraphView(const SubgraphView& subgraph optimizationViews.GetINetwork()->AddPrecompiledLayer( PreCompiledDescriptor(supportedSubgraph->GetNumInputSlots(), supportedSubgraph->GetNumOutputSlots()), - blobPtr, + std::move(blobPtr), backend, nullptr); diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index c40c5131a8..8e51a527b9 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -161,7 +161,7 @@ TEST_CASE("OptimizedViewsSubgraphLayerCountUsingGetINetwork") // Create a Network containing a layer to substitute in NetworkImpl net; Layer* substitutionpreCompiledLayer = PolymorphicDowncast<Layer*>( - net.AddPrecompiledLayer(substitutionLayerDescriptor, blobPtr, backend)); + net.AddPrecompiledLayer(substitutionLayerDescriptor, std::move(blobPtr), backend)); // Subgraph for a substitution layer SubgraphViewSelector::SubgraphViewPtr substitutionSubgraph = |