diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-07-17 12:28:42 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
| commit | 7d66a8e3f603f2cd363f04a750847e3f9eabdfd4 (patch) | |
| tree | 0d7e1ad5bf0ecd32cd919074f756d27c351d7638 /src/graph | |
| parent | ae54e026c86aec7d6819ee3ef76372c1a3c92467 (diff) | |
| download | ComputeLibrary-7d66a8e3f603f2cd363f04a750847e3f9eabdfd4.tar.gz | |
COMPMID-1386: Add support for converting weights for CL.
Change-Id: I62e3ead903366baeeb1488f233a9b8b0c388c9de
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/140403
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/graph')
| -rw-r--r-- | src/graph/GraphBuilder.cpp | 9 | ||||
| -rw-r--r-- | src/graph/nodes/FullyConnectedLayer.cpp | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 3b906c0ffd..d26039ec35 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -446,8 +446,13 @@ NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, Node b_nid = add_const_node_with_name(g, params, "Bias", b_desc, std::move(bias_accessor)); } - // Create convolution node and connect - NodeID fc_nid = g.add_node<FullyConnectedLayerNode>(num_outputs); + // Add fully connected info + // FIXME (COMPMID-1367) : Expose weights layout + FullyConnectedLayerInfo fc_info; + fc_info.weights_trained_layout = DataLayout::NCHW; + + // Create fully connected node and connect + NodeID fc_nid = g.add_node<FullyConnectedLayerNode>(num_outputs, fc_info); g.add_connection(input.node_id, input.index, fc_nid, 0); g.add_connection(w_nid, 0, fc_nid, 1); if(has_bias) diff --git a/src/graph/nodes/FullyConnectedLayer.cpp b/src/graph/nodes/FullyConnectedLayer.cpp index d94a7851ff..6ba4eefa88 100644 --- a/src/graph/nodes/FullyConnectedLayer.cpp +++ b/src/graph/nodes/FullyConnectedLayer.cpp @@ -31,8 +31,8 @@ namespace arm_compute { namespace graph { -FullyConnectedLayerNode::FullyConnectedLayerNode(unsigned int num_outputs) - : _num_outputs(num_outputs) +FullyConnectedLayerNode::FullyConnectedLayerNode(unsigned int num_outputs, FullyConnectedLayerInfo fc_info) + : _num_outputs(num_outputs), _info(fc_info) { _input_edges.resize(3, EmptyEdgeID); _outputs.resize(1, NullTensorID); @@ -75,6 +75,11 @@ TensorDescriptor FullyConnectedLayerNode::compute_output_descriptor(const Tensor return output_descriptor; } +FullyConnectedLayerInfo FullyConnectedLayerNode::info() const +{ + return _info; +} + bool FullyConnectedLayerNode::forward_descriptors() { if((input_id(0) != NullTensorID) && (output_id(0) != NullTensorID)) |