From e2220551b7a64b929650ba9a60529c31e70c13c5 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 20 Jul 2018 13:23:44 +0100 Subject: COMPMID-1367: Enable NHWC in graph examples Change-Id: Iabc54a3a1bdcd46a9a921cda39c7c85fef672b72 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141449 Reviewed-by: Giorgio Arena Reviewed-by: Anthony Barbier Tested-by: Jenkins --- arm_compute/graph/frontend/Layers.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arm_compute/graph/frontend/Layers.h') diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index 197d2ea409..02ef56952d 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -595,7 +595,7 @@ public: } else if(_branch_merge_method == BranchMergeMethod::DEPTH_CONCATENATE) { - // Collect tail nodes and perform DepthConcatenate + // Collect tail nodes and concatenate std::vector nodes; for(auto &ss : _sub_streams) { @@ -608,14 +608,14 @@ public: } } } - nid = GraphBuilder::add_depth_concatenate_node(s.graph(), common_params, nodes); + nid = GraphBuilder::add_concatenate_node(s.graph(), common_params, nodes, DataLayoutDimension::CHANNEL); } else { ARM_COMPUTE_ERROR_ON(_sub_streams.size() != 2); NodeIdxPair input0 = { _sub_streams[0]->tail_node(), 0 }; NodeIdxPair input1 = { _sub_streams[1]->tail_node(), 0 }; - nid = GraphBuilder::add_elementwise_node(s.graph(), common_params, input0, input1, EltwiseOperation::ADD); + nid = GraphBuilder::add_elementwise_node(s.graph(), common_params, input0, input1, EltwiseOperation::Add); } return nid; } -- cgit v1.2.1