diff options
author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-03-08 14:52:17 +0000 |
---|---|---|
committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-03-13 11:58:43 +0000 |
commit | a42f55f4184cb63c73b74ed76759bdcbb18656e8 (patch) | |
tree | 4b82cfde94994bd5ab350fd2362896dee8391c68 /src | |
parent | acce504ec4aebe5e5da470c1cfc3cee401ff11f3 (diff) | |
download | ComputeLibrary-a42f55f4184cb63c73b74ed76759bdcbb18656e8.tar.gz |
COMPMID-1995: Allow weights and bias to be passed as SubStream in FullyConnectedLayer
Change-Id: Iae2e7d55fd66d5932c29f78ef3112289d9b69b84
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/848
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/graph/GraphBuilder.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index a944d2c25d..30f1fc6894 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -405,6 +405,33 @@ NodeID GraphBuilder::add_flatten_node(Graph &g, NodeParams params, NodeIdxPair i } NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, + NodeID weights_nid, NodeID bias_nid, + const FullyConnectedLayerInfo fc_info, const QuantizationInfo out_quant_info) +{ + CHECK_NODEIDX_PAIR(input, g); + ARM_COMPUTE_ERROR_ON(num_outputs == 0); + ARM_COMPUTE_ERROR_ON(weights_nid == EmptyNodeID); + + const bool has_bias = (bias_nid != EmptyNodeID); + + // Get input tensor descriptor + const TensorDescriptor input_tensor_desc = get_tensor_descriptor(g, g.node(input.node_id)->outputs()[0]); + + // Create fully connected node and connect + NodeID fc_nid = g.add_node<FullyConnectedLayerNode>(num_outputs, out_quant_info, fc_info); + g.add_connection(input.node_id, input.index, fc_nid, 0); + g.add_connection(weights_nid, 0, fc_nid, 1); + if(has_bias) + { + g.add_connection(bias_nid, 0, fc_nid, 2); + } + + set_node_params(g, fc_nid, params); + + return fc_nid; +} + +NodeID GraphBuilder::add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, ITensorAccessorUPtr weights_accessor, ITensorAccessorUPtr bias_accessor, const FullyConnectedLayerInfo fc_info, const QuantizationInfo weights_quant_info, const QuantizationInfo out_quant_info) |