From 1562be3e8a449360a90af75f6f1481a30d41be75 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 8 Mar 2018 19:09:19 +0000 Subject: COMPMID-998: Release unused trainable parameters. Change-Id: I361a520f34080016a25bc86e1e6789777c5152c1 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124432 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- src/graph2/GraphManager.cpp | 6 ++++++ src/graph2/backends/CL/CLSubTensorHandle.cpp | 5 +++++ src/graph2/backends/CL/CLTensorHandle.cpp | 9 +++++++++ src/graph2/backends/GLES/GCTensorHandle.cpp | 9 +++++++++ src/graph2/backends/NEON/NESubTensorHandle.cpp | 5 +++++ src/graph2/backends/NEON/NETensorHandle.cpp | 9 +++++++++ src/graph2/detail/ExecutionHelpers.cpp | 11 +++++++++++ 7 files changed, 54 insertions(+) (limited to 'src/graph2') diff --git a/src/graph2/GraphManager.cpp b/src/graph2/GraphManager.cpp index e708dc6a61..a51ba61104 100644 --- a/src/graph2/GraphManager.cpp +++ b/src/graph2/GraphManager.cpp @@ -82,6 +82,12 @@ void GraphManager::finalize_graph(Graph &graph, GraphContext &ctx, PassManager & // Finalize Graph context ctx.finalize(); + + // Make first run + execute_graph(graph); + + // Release all unused const nodes + detail::release_unused_tensors(graph); } void GraphManager::execute_graph(Graph &graph) diff --git a/src/graph2/backends/CL/CLSubTensorHandle.cpp b/src/graph2/backends/CL/CLSubTensorHandle.cpp index a001d57832..65a1ba4d5f 100644 --- a/src/graph2/backends/CL/CLSubTensorHandle.cpp +++ b/src/graph2/backends/CL/CLSubTensorHandle.cpp @@ -64,6 +64,11 @@ void CLSubTensorHandle::unmap() _sub_tensor.unmap(); } +void CLSubTensorHandle::release_if_unused() +{ + // noop +} + bool CLSubTensorHandle::is_subtensor() const { return true; diff --git a/src/graph2/backends/CL/CLTensorHandle.cpp b/src/graph2/backends/CL/CLTensorHandle.cpp index f515e0bac3..89678fb280 100644 --- a/src/graph2/backends/CL/CLTensorHandle.cpp +++ b/src/graph2/backends/CL/CLTensorHandle.cpp @@ -60,6 +60,15 @@ void CLTensorHandle::unmap() _tensor.unmap(); } +void CLTensorHandle::release_if_unused() +{ + // TODO (geopin01): Release tensor only if all sub-tensors are marked as not used + if(!_tensor.is_used()) + { + _tensor.allocator()->free(); + } +} + bool CLTensorHandle::is_subtensor() const { return false; diff --git a/src/graph2/backends/GLES/GCTensorHandle.cpp b/src/graph2/backends/GLES/GCTensorHandle.cpp index aa9ac8c2e9..2165cd2de6 100644 --- a/src/graph2/backends/GLES/GCTensorHandle.cpp +++ b/src/graph2/backends/GLES/GCTensorHandle.cpp @@ -60,6 +60,15 @@ void GCTensorHandle::unmap() _tensor.unmap(); } +void GCTensorHandle::release_if_unused() +{ + // TODO (geopin01): Release tensor only if all sub-tensors are marked as not used + if(!_tensor.is_used()) + { + _tensor.allocator()->free(); + } +} + bool GCTensorHandle::is_subtensor() const { return false; diff --git a/src/graph2/backends/NEON/NESubTensorHandle.cpp b/src/graph2/backends/NEON/NESubTensorHandle.cpp index 491cf8259c..1cd15be29c 100644 --- a/src/graph2/backends/NEON/NESubTensorHandle.cpp +++ b/src/graph2/backends/NEON/NESubTensorHandle.cpp @@ -61,6 +61,11 @@ void NESubTensorHandle::unmap() // noop } +void NESubTensorHandle::release_if_unused() +{ + // noop +} + bool NESubTensorHandle::is_subtensor() const { return true; diff --git a/src/graph2/backends/NEON/NETensorHandle.cpp b/src/graph2/backends/NEON/NETensorHandle.cpp index a4af8aaf9b..0b901c3497 100644 --- a/src/graph2/backends/NEON/NETensorHandle.cpp +++ b/src/graph2/backends/NEON/NETensorHandle.cpp @@ -59,6 +59,15 @@ void NETensorHandle::unmap() { } +void NETensorHandle::release_if_unused() +{ + // TODO (geopin01): Release tensor only if all sub-tensors are marked as not used + if(!_tensor.is_used()) + { + _tensor.allocator()->free(); + } +} + bool NETensorHandle::is_subtensor() const { return false; diff --git a/src/graph2/detail/ExecutionHelpers.cpp b/src/graph2/detail/ExecutionHelpers.cpp index ae214ad5a6..3688d0b0dc 100644 --- a/src/graph2/detail/ExecutionHelpers.cpp +++ b/src/graph2/detail/ExecutionHelpers.cpp @@ -135,6 +135,17 @@ ExecutionWorkload configure_all_nodes(Graph &g, GraphContext &ctx) return workload; } +void release_unused_tensors(Graph &g) +{ + for(auto &tensor : g.tensors()) + { + if(tensor != nullptr && tensor->handle() != nullptr) + { + tensor->handle()->release_if_unused(); + } + } +} + void call_tensor_accessor(Tensor *tensor) { ARM_COMPUTE_ERROR_ON(!tensor); -- cgit v1.2.1