diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-10-16 19:10:46 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:55:45 +0000 |
| commit | 08346e9b9a7dadd2f0765aea64e656902d843e8a (patch) | |
| tree | 6caaebd05a3b78a4a1e8bfb077aa02d75bd4cca0 /src/graph/nodes | |
| parent | 8aaf93e8c12ce93d3d0082d4f4b70376f15536da (diff) | |
| download | ComputeLibrary-08346e9b9a7dadd2f0765aea64e656902d843e8a.tar.gz | |
COMPMID-1451:Fuse RELU,LU_BOUNDED_RELU with requantization in NEGEMMConvolutionLayer.
Change-Id: Iea5f2c5bcac8051c4c7655a6eabb2c43772eb31f
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/154104
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'src/graph/nodes')
| -rw-r--r-- | src/graph/nodes/BatchNormalizationLayerNode.cpp | 2 | ||||
| -rw-r--r-- | src/graph/nodes/ConvolutionLayerNode.cpp | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/graph/nodes/BatchNormalizationLayerNode.cpp b/src/graph/nodes/BatchNormalizationLayerNode.cpp index 3ae11fc24d..3d392bda1b 100644 --- a/src/graph/nodes/BatchNormalizationLayerNode.cpp +++ b/src/graph/nodes/BatchNormalizationLayerNode.cpp @@ -78,7 +78,7 @@ TensorDescriptor BatchNormalizationLayerNode::configure_output(size_t idx) const NodeType BatchNormalizationLayerNode::type() const { - return NodeType::BatchNormalizationLayer; + return BatchNormalizationLayerNode::node_type; } void BatchNormalizationLayerNode::accept(INodeVisitor &v) diff --git a/src/graph/nodes/ConvolutionLayerNode.cpp b/src/graph/nodes/ConvolutionLayerNode.cpp index e9cb0396eb..15c7ff68f8 100644 --- a/src/graph/nodes/ConvolutionLayerNode.cpp +++ b/src/graph/nodes/ConvolutionLayerNode.cpp @@ -37,7 +37,7 @@ ConvolutionLayerNode::ConvolutionLayerNode(PadStrideInfo info, ConvolutionMethod method, FastMathHint fast_math_hint, QuantizationInfo out_quant_info) - : _info(std::move(info)), _num_groups(num_groups), _method(method), _fast_math_hint(fast_math_hint), _out_quant_info(out_quant_info) + : _info(std::move(info)), _num_groups(num_groups), _method(method), _fast_math_hint(fast_math_hint), _out_quant_info(out_quant_info), _fused_activation() { _input_edges.resize(3, EmptyEdgeID); _outputs.resize(1, NullTensorID); @@ -73,6 +73,16 @@ unsigned int ConvolutionLayerNode::num_groups() const return _num_groups; } +ActivationLayerInfo ConvolutionLayerNode::fused_activation() const +{ + return _fused_activation; +} + +void ConvolutionLayerNode::set_fused_activation(ActivationLayerInfo fused_activation) +{ + _fused_activation = fused_activation; +} + TensorDescriptor ConvolutionLayerNode::compute_output_descriptor(const TensorDescriptor &input_descriptor, const TensorDescriptor &weights_descriptor, const PadStrideInfo &info) @@ -126,7 +136,7 @@ TensorDescriptor ConvolutionLayerNode::configure_output(size_t idx) const NodeType ConvolutionLayerNode::type() const { - return NodeType::ConvolutionLayer; + return ConvolutionLayerNode::node_type; } void ConvolutionLayerNode::accept(INodeVisitor &v) |