COMPMID-1367: Enable NHWC in graph examples
Change-Id: Iabc54a3a1bdcd46a9a921cda39c7c85fef672b72
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/141449
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index 197d2ea..02ef569 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -595,7 +595,7 @@
}
else if(_branch_merge_method == BranchMergeMethod::DEPTH_CONCATENATE)
{
- // Collect tail nodes and perform DepthConcatenate
+ // Collect tail nodes and concatenate
std::vector<NodeIdxPair> nodes;
for(auto &ss : _sub_streams)
{
@@ -608,14 +608,14 @@
}
}
}
- 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;
}