diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-08-15 12:14:46 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | 2a2db590fd179dcb8e1a575293cd2b887e2dc246 (patch) | |
tree | 5e10da7cb6777f3020b84a2389b279ceef2be5ee /src/graph/detail | |
parent | c1961b51df2e15a01a5950139e81bbd47fbfa627 (diff) | |
download | ComputeLibrary-2a2db590fd179dcb8e1a575293cd2b887e2dc246.tar.gz |
COMPMID-1505: Add native grouping support at graph level
Change-Id: Iedc91b0aee743b59af5140c8acb8124548da3163
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/144362
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/graph/detail')
-rw-r--r-- | src/graph/detail/ExecutionHelpers.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/graph/detail/ExecutionHelpers.cpp b/src/graph/detail/ExecutionHelpers.cpp index 6df67fcfec..6157b7fecf 100644 --- a/src/graph/detail/ExecutionHelpers.cpp +++ b/src/graph/detail/ExecutionHelpers.cpp @@ -59,7 +59,7 @@ void configure_all_tensors(Graph &g) for(auto &tensor : tensors) { - if(tensor) + if(tensor && tensor->handle() == nullptr) { Target target = tensor->desc().target; auto backend = backends::BackendRegistry::get().find_backend(target); @@ -131,17 +131,16 @@ void allocate_all_tensors(Graph &g) } } -ExecutionWorkload configure_all_nodes(Graph &g, GraphContext &ctx) +ExecutionWorkload configure_all_nodes(Graph &g, GraphContext &ctx, const std::vector<NodeID> &node_order) { ExecutionWorkload workload; workload.graph = &g; workload.ctx = &ctx; - auto &nodes = g.nodes(); - // Create tasks - for(auto &node : nodes) + for(auto &node_id : node_order) { + auto node = g.node(node_id); if(node != nullptr) { Target assigned_target = node->assigned_target(); @@ -152,14 +151,14 @@ ExecutionWorkload configure_all_nodes(Graph &g, GraphContext &ctx) { ExecutionTask task; task.task = std::move(func); - task.node = node.get(); + task.node = node; workload.tasks.push_back(std::move(task)); } } } // Add inputs and outputs - for(auto &node : nodes) + for(auto &node : g.nodes()) { if(node != nullptr && node->type() == NodeType::Input) { |