diff options
author | Finn Williams <Finn.Williams@arm.com> | 2021-03-22 17:51:06 +0000 |
---|---|---|
committer | finn.williams <finn.williams@arm.com> | 2021-04-07 16:42:38 +0000 |
commit | 4422ceca976a88aac49b21808a43e465bc87a35e (patch) | |
tree | d4f7f3d86394f74b679c907ad3f7fc7f4537933f /src/armnn/test/GraphTests.cpp | |
parent | b70ec417989490a2a72c66ecd6c737df1c094f4c (diff) | |
download | armnn-4422ceca976a88aac49b21808a43e465bc87a35e.tar.gz |
Fix graph copy memory spike
* Change layer storage of ConstTensors to std::shared_ptr<ConstCpuTensorHandle>
* Change clone to share ConstTensor rather than copy
* Remove uses of non-const GetTensor() call
* Reduce scope of non-optimized network in ExeNet, so memory can be released after use
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: Ibb2c7309d12411d21405bd6024c76bcdf5404545
Diffstat (limited to 'src/armnn/test/GraphTests.cpp')
-rw-r--r-- | src/armnn/test/GraphTests.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index 55a01fcc94..602575b352 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -590,4 +590,28 @@ BOOST_AUTO_TEST_CASE(DuplicateLayerNames) BOOST_TEST(((*std::next(it))->GetType() == armnn::LayerType::Output)); } +BOOST_AUTO_TEST_CASE(CheckGraphConstTensorSharing) +{ + armnn::Graph graph0; + const float* sharedWeightPtr; + + { + armnn::Graph graph1; + + armnn::FullyConnectedLayer* const fcLayer = + graph1.AddLayer<armnn::FullyConnectedLayer>(armnn::FullyConnectedDescriptor(), "fc"); + + float weight = 1.0f; + armnn::ConstTensor constTensor({{ 1, 1 }, armnn::DataType::Float32}, &weight); + fcLayer->m_Weight = std::make_shared<armnn::ScopedCpuTensorHandle>(constTensor);; + // point sharedWeightPtr to graph1's const tensor + sharedWeightPtr = fcLayer->m_Weight->GetConstTensor<float>(); + + graph0 = armnn::Graph(graph1); + // graph1 goes out of scope + } + + BOOST_TEST(*sharedWeightPtr == 1); +} + BOOST_AUTO_TEST_SUITE_END() |