From c55cef103a329a4e203c929276ed02ac45820de1 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 1 Aug 2018 15:24:18 +0100 Subject: COMPMID-1188: Expose FullyConnectedLayer info metadata at graph level Change-Id: I7670f79209a1e4439d57e05c1f5c576f600971cb Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/142299 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- arm_compute/graph/GraphBuilder.h | 6 ++++-- arm_compute/graph/Types.h | 1 + arm_compute/graph/frontend/Layers.h | 26 +++++++++++++++----------- 3 files changed, 20 insertions(+), 13 deletions(-) (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 5bb1df4a11..a2f7618876 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -218,6 +218,7 @@ public: * @param[in] num_outputs Number of output neurons * @param[in] weights_accessor (Optional) Accessor of the weights node data * @param[in] bias_accessor (Optional) Accessor of the bias node data + * @param[in] fc_info (Optional) Fully connected layer metadata * @param[in] weights_quant_info (Optional) Weights quantization info * @param[in] out_quant_info (Optional) Output quantization info * @@ -225,8 +226,9 @@ public: */ static NodeID add_fully_connected_layer(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_outputs, ITensorAccessorUPtr weights_accessor = nullptr, ITensorAccessorUPtr bias_accessor = nullptr, - const QuantizationInfo weights_quant_info = QuantizationInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()); + const FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), + const QuantizationInfo weights_quant_info = QuantizationInfo(), + const QuantizationInfo out_quant_info = QuantizationInfo()); /** Adds a normalization layer node to the graph * * @param[in] g Graph to add the node to diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index f22f50ac82..ee0bf429ad 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -48,6 +48,7 @@ using arm_compute::Size2D; using arm_compute::ActivationLayerInfo; using arm_compute::NormType; using arm_compute::NormalizationLayerInfo; +using arm_compute::FullyConnectedLayerInfo; using arm_compute::PadStrideInfo; using arm_compute::PoolingLayerInfo; using arm_compute::PoolingType; diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index a222c8546e..0a1a0cf1e4 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -384,17 +384,20 @@ public: * @param[in] num_outputs Number of outputs. * @param[in] weights Accessor to get weights from. * @param[in] bias Accessor to get bias from. + * @param[in] fc_info (Optional) Fully connected layer metadata * @param[in] weights_quant_info (Optional) Weights quantization information * @param[in] out_quant_info (Optional) Output quantization info */ - FullyConnectedLayer(unsigned int num_outputs, - ITensorAccessorUPtr weights, - ITensorAccessorUPtr bias, - const QuantizationInfo weights_quant_info = QuantizationInfo(), - const QuantizationInfo out_quant_info = QuantizationInfo()) + FullyConnectedLayer(unsigned int num_outputs, + ITensorAccessorUPtr weights, + ITensorAccessorUPtr bias, + const FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), + const QuantizationInfo weights_quant_info = QuantizationInfo(), + const QuantizationInfo out_quant_info = QuantizationInfo()) : _num_outputs(num_outputs), _weights(std::move(weights)), _bias(std::move(bias)), + _fc_info(fc_info), _weights_quant_info(std::move(weights_quant_info)), _out_quant_info(std::move(out_quant_info)) { @@ -405,16 +408,17 @@ public: NodeParams common_params = { name(), s.hints().target_hint }; NodeIdxPair input = { s.tail_node(), 0 }; return GraphBuilder::add_fully_connected_layer(s.graph(), common_params, input, _num_outputs, - std::move(_weights), std::move(_bias), + std::move(_weights), std::move(_bias), _fc_info, std::move(_weights_quant_info), std::move(_out_quant_info)); } private: - unsigned int _num_outputs; - ITensorAccessorUPtr _weights; - ITensorAccessorUPtr _bias; - const QuantizationInfo _weights_quant_info; - const QuantizationInfo _out_quant_info; + unsigned int _num_outputs; + ITensorAccessorUPtr _weights; + ITensorAccessorUPtr _bias; + const FullyConnectedLayerInfo _fc_info; + const QuantizationInfo _weights_quant_info; + const QuantizationInfo _out_quant_info; }; /** Normalization Layer */ -- cgit v1.2.1