aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheri Zhang <sheri.zhang@arm.com>2021-11-02 10:45:07 +0000
committerSheri Zhang <sheri.zhang@arm.com>2021-11-03 17:08:05 +0000
commitfb2280381e7a98ad698ea0c1b2cd635a48ad4acc (patch)
treee3fab3cff60b806e725ba9c771617e41c654604e
parentbc788389dcc7bd682f53a85803f6a202d42ac828 (diff)
downloadComputeLibrary-fb2280381e7a98ad698ea0c1b2cd635a48ad4acc.tar.gz
Add graph level convolution fusion with post operator
Resolves: COMPMID-4701 Signed-off-by: Sheri Zhang <sheri.zhang@arm.com> Change-Id: I8a0d3c2ed4bf84489d94b8ae6641d6041aadaee5 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/6557 Tested-by: Arm Jenkins <bsgcomp@arm.com> Reviewed-by: Gunes Bayir <gunes.bayir@arm.com> Reviewed-by: SiCong Li <sicong.li@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r--arm_compute/graph/INodeVisitor.h6
-rw-r--r--arm_compute/graph/TypePrinter.h3
-rw-r--r--arm_compute/graph/Types.h51
-rw-r--r--arm_compute/graph/backends/FunctionHelpers.h94
-rw-r--r--arm_compute/graph/backends/ValidateHelpers.h36
-rw-r--r--arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h143
-rw-r--r--arm_compute/graph/nodes/Nodes.h3
-rw-r--r--arm_compute/graph/nodes/NodesFwd.h3
-rw-r--r--arm_compute/graph/printers/DotGraphPrinter.h24
-rw-r--r--src/graph/INodeVisitor.cpp4
-rw-r--r--src/graph/backends/CL/CLFunctionsFactory.cpp3
-rw-r--r--src/graph/backends/CL/CLNodeValidator.cpp2
-rw-r--r--src/graph/mutators/NodeFusionMutator.cpp274
-rw-r--r--src/graph/nodes/FusedConvolutionWithPostOpNode.cpp164
-rw-r--r--src/graph/printers/DotGraphPrinter.cpp8
15 files changed, 810 insertions, 8 deletions
diff --git a/arm_compute/graph/INodeVisitor.h b/arm_compute/graph/INodeVisitor.h
index 85da59022b..4cb601fb02 100644
--- a/arm_compute/graph/INodeVisitor.h
+++ b/arm_compute/graph/INodeVisitor.h
@@ -106,6 +106,11 @@ public:
* @param[in] n Node to visit.
*/
virtual void visit(FusedConvolutionBatchNormalizationNode &n) = 0;
+ /** Visit FusedConvolutionWithPostOpNode.
+ *
+ * @param[in] n Node to visit.
+ */
+ virtual void visit(FusedConvolutionWithPostOpNode &n) = 0;
/** Visit FusedDepthwiseConvolutionBatchNormalizationNode.
*
* @param[in] n Node to visit.
@@ -205,6 +210,7 @@ public:
virtual void visit(FlattenLayerNode &n) override;
virtual void visit(FullyConnectedLayerNode &n) override;
virtual void visit(FusedConvolutionBatchNormalizationNode &n) override;
+ virtual void visit(FusedConvolutionWithPostOpNode &n) override;
virtual void visit(FusedDepthwiseConvolutionBatchNormalizationNode &n) override;
virtual void visit(InputNode &n) override;
virtual void visit(NormalizationLayerNode &n) override;
diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h
index 0bbb4695de..a8a20c9de8 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -116,6 +116,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type)
case NodeType::FusedConvolutionBatchNormalizationLayer:
os << "FusedConvolutionBatchNormalizationLayer";
break;
+ case NodeType::FusedConvolutionWithPostOp:
+ os << "FusedConvolutionWithPostOp";
+ break;
case NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer:
os << "FusedDepthwiseConvolutionBatchNormalizationLayer";
break;
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index 63a9433fe6..e802e9dc77 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -62,6 +62,7 @@ using arm_compute::PoolingType;
using arm_compute::PriorBoxLayerInfo;
using arm_compute::DimensionRoundingType;
using arm_compute::InterpolationPolicy;
+using arm_compute::experimental::PostOpType;
using GraphID = unsigned int;
using TensorID = unsigned int;
@@ -145,6 +146,55 @@ enum class FastMathHint
Disabled, /**< Fast math disabled for Convolution layer */
};
+/** Convolution post operator info */
+class ConvPostOpInfo
+{
+public:
+ /** Returns post op type
+ *
+ * @return Post op type
+ */
+ virtual PostOpType type() const = 0;
+ virtual ~ConvPostOpInfo()
+ {
+ }
+};
+
+class ConvPostOpInfoActivation : public ConvPostOpInfo
+{
+public:
+ ConvPostOpInfoActivation(const ActivationLayerInfo &act)
+ : _act(act)
+ {
+ }
+ ~ConvPostOpInfoActivation() override
+ {
+ }
+ PostOpType type() const override
+ {
+ return PostOpType::Activation;
+ }
+ ActivationLayerInfo _act;
+};
+
+class ConvPostOpInfoEltwiseAdd : public ConvPostOpInfo
+{
+public:
+ ConvPostOpInfoEltwiseAdd(int arg_pos, const ConvertPolicy &policy)
+ : _prev_op_dst_pos(arg_pos), _policy(policy)
+ {
+ }
+ PostOpType type() const override
+ {
+ return PostOpType::Eltwise_Add;
+ }
+ ~ConvPostOpInfoEltwiseAdd() override
+ {
+ }
+ int _prev_op_dst_pos;
+ ConvertPolicy _policy;
+};
+
/** Supported nodes */
enum class NodeType
{
@@ -165,6 +215,7 @@ enum class NodeType
FlattenLayer,
FullyConnectedLayer,
FusedConvolutionBatchNormalizationLayer,
+ FusedConvolutionWithPostOp,
FusedDepthwiseConvolutionBatchNormalizationLayer,
GenerateProposalsLayer,
L2NormalizeLayer,
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index 9830290d0f..6bec66a6ff 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -450,7 +450,7 @@ std::unique_ptr<arm_compute::IFunction> create_concatenate_layer(ConcatenateLaye
/** Create a backend convolution layer function
*
* @tparam ConvolutionLayerFunctions Backend convolution functions
- * @tparam TargetInfo Target-specific information
+ * @tparam TargetInfo Target-specific information
*
* @param[in] node Node to create the backend function for
* @param[in] ctx Graph context
@@ -538,6 +538,98 @@ std::unique_ptr<IFunction> create_convolution_layer(ConvolutionLayerNode &node,
return std::move(func);
}
+/** Create a backend convolution layer function with post opreator
+ *
+ * @tparam ConvolutionLayerFunctions Backend convolution functions
+ * @tparam TargetInfo Target-specific information
+ *
+ * @param[in] node Node to create the backend function for
+ * @param[in] ctx Graph context
+ *
+ * @return Backend convolution layer function
+ */
+template <typename ConvolutionLayerFunctions, typename TargetInfo>
+std::unique_ptr<IFunction> create_fused_convolution_with_post_op(FusedConvolutionWithPostOpNode &node, GraphContext &ctx)
+{
+ validate_node<TargetInfo>(node, 4 /* expected inputs */, 1 /* expected outputs */);
+
+ // Extract IO and info
+ typename TargetInfo::TensorType *input = get_backing_tensor<TargetInfo>(node.input(0));
+ typename TargetInfo::TensorType *weights = get_backing_tensor<TargetInfo>(node.input(1));
+ typename TargetInfo::TensorType *biases = get_backing_tensor<TargetInfo>(node.input(2));
+ typename TargetInfo::TensorType *output = get_backing_tensor<TargetInfo>(node.output(0));
+
+ const bool is_quantized = is_data_type_quantized_asymmetric(input->info()->data_type());
+
+ if(is_quantized)
+ {
+ biases->info()->set_data_type(DataType::S32);
+ }
+
+ const PadStrideInfo conv_info = node.convolution_info();
+ const unsigned int num_groups = node.num_groups();
+ const ActivationLayerInfo fused_act = node.fused_activation();
+
+ experimental::PostOpList<typename TargetInfo::TensorType *> post_ops;
+
+ auto &post_op_info_list = node.post_op_info_list();
+ for(const auto &post_op_info : post_op_info_list)
+ {
+ switch(post_op_info->type())
+ {
+ case PostOpType::Activation:
+ {
+ const auto act_info = utils::cast::polymorphic_downcast<const ConvPostOpInfoActivation *>(post_op_info.get());
+ post_ops.template push_back_op<experimental::PostOpAct<typename TargetInfo::TensorType *>>(act_info->_act);
+ break;
+ }
+ case PostOpType::Eltwise_Add:
+ {
+ typename TargetInfo::TensorType *add_input = get_backing_tensor<TargetInfo>(node.input(3));
+ const auto eltwise_info = utils::cast::polymorphic_downcast<const ConvPostOpInfoEltwiseAdd *>(post_op_info.get());
+ post_ops.template push_back_op<experimental::PostOpEltwiseAdd<typename TargetInfo::TensorType *>>(add_input, eltwise_info->_prev_op_dst_pos, eltwise_info->_policy);
+ break;
+ }
+ default:
+ {
+ ARM_COMPUTE_ERROR("Unsupported PostOpType");
+ }
+ }
+ }
+
+ // Create and configure function (we assume that functions have been validated before creation)
+ std::shared_ptr<IMemoryManager> mm = get_memory_manager(ctx, TargetInfo::TargetType);
+ std::unique_ptr<IFunction> func;
+ std::string func_name;
+
+ std::tie(func, func_name) = create_named_memory_managed_function<typename ConvolutionLayerFunctions::GEMMConvolutionLayer>(
+ std::string("GEMMConvolutionLayer"), mm,
+ input, weights, biases, output, conv_info,
+ WeightsInfo(), Size2D(1U, 1U), fused_act, num_groups, post_ops);
+
+ // Log info
+ std::ostringstream qss;
+ if(is_quantized)
+ {
+ qss << " Input QuantInfo: " << input->info()->quantization_info()
+ << " Weights QuantInfo: " << weights->info()->quantization_info()
+ << " Output QuantInfo: " << output->info()->quantization_info();
+ }
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated "
+ << node.name()
+ << " Type: " << func_name
+ << " Target: " << TargetInfo::TargetType
+ << " Data Type: " << input->info()->data_type()
+ << " Groups: " << num_groups
+ << " Input shape: " << input->info()->tensor_shape()
+ << " Weights shape: " << weights->info()->tensor_shape()
+ << " Output shape: " << output->info()->tensor_shape()
+ << qss.str()
+ << (fused_act.enabled() ? " " + to_string(fused_act.activation()) : "")
+ << std::endl);
+ return std::move(func);
+}
+
/** Create a backend deconvolution layer function
*
* @tparam DeconvolutionLayerFunction Backend deconvolution function
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index 93d547b036..89dccd88b7 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -183,6 +183,42 @@ Status validate_convolution_layer(ConvolutionLayerNode &node)
return status;
}
+/** Validates a Convolution layer node
+ *
+ * @tparam GEMMConvolutionLayer GEMM Convolution layer function type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename GEMMConvolutionLayer>
+Status validate_fused_convolution_with_post_op(FusedConvolutionWithPostOpNode &node)
+{
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating fused ConvolutionLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl);
+ ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 4);
+ ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1);
+
+ // Extract IO and info
+ arm_compute::ITensorInfo *input = get_backing_tensor_info(node.input(0));
+ arm_compute::ITensorInfo *weights = get_backing_tensor_info(node.input(1));
+ arm_compute::ITensorInfo *biases = get_backing_tensor_info(node.input(2));
+ arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0));
+
+ if(is_data_type_quantized_asymmetric(input->data_type()))
+ {
+ biases->set_data_type(DataType::S32);
+ }
+
+ const PadStrideInfo conv_info = node.convolution_info();
+ //const ConvolutionMethod conv_algorithm = node.convolution_method();
+ //const bool fast_math = node.fast_math_hint() == FastMathHint::Enabled;
+ const unsigned int num_groups = node.num_groups();
+
+ // Validate function
+ return GEMMConvolutionLayer::validate(input, weights, biases, output, conv_info,
+ WeightsInfo(), Size2D(1, 1), ActivationLayerInfo(), num_groups);
+}
+
/** Validates a Depthwise Convolution layer node
*
* @tparam DepthwiseConvolutionLayer Default Depthwise Convolution layer type
diff --git a/arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h b/arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h
new file mode 100644
index 0000000000..0bb3d1b7ef
--- /dev/null
+++ b/arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021 Arm Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_WITH_POST_OP_NODE_H
+#define ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_WITH_POST_OP_NODE_H
+
+#include "arm_compute/graph/INode.h"
+
+#include <list>
+
+namespace arm_compute
+{
+namespace graph
+{
+/** Convolution node */
+class FusedConvolutionWithPostOpNode final : public INode
+{
+public:
+ /** Constructor
+ *
+ * @param[in] info Convolution layer attributes
+ * @param[in] num_groups (Optional) Number of groups (Defaults to 1)
+ * @param[in] method (Optional) Convolution method to use
+ * @param[in] fast_math_hint (Optional) Fast math hint
+ * @param[in] out_quant_info (Optional) Output quantization info
+ */
+ FusedConvolutionWithPostOpNode(PadStrideInfo info,
+ unsigned int num_groups = 1,
+ ConvolutionMethod method = ConvolutionMethod::Default,
+ FastMathHint fast_math_hint = FastMathHint::Disabled,
+ QuantizationInfo out_quant_info = QuantizationInfo());
+ /** Sets the convolution layer method to use
+ *
+ * @param[in] method Method to use for convolution
+ */
+ void set_convolution_method(ConvolutionMethod method);
+ /** Convolution layer method accessor
+ *
+ * @note This is an indication on which convolution layer implementation to use,
+ * if it fails to be created the library's heuristic approach will be used
+ *
+ * @return Convolution layer method to be used by the node
+ */
+ ConvolutionMethod convolution_method() const;
+ /** Sets the fast math fast hint
+ *
+ * @param[in] hint Hint to use for convolution
+ */
+ void set_fast_math_hint(FastMathHint hint);
+ /** Fast math hint accessor
+ *
+ * @return Fast math hint to be used by the node
+ */
+ FastMathHint fast_math_hint() const;
+ /** Post operator info list
+ *
+ * @return Post operator info list
+ */
+ const std::list<std::unique_ptr<ConvPostOpInfo>> &post_op_info_list() const;
+ /** Post operator info list
+ *
+ * @return Post operator info list
+ */
+ std::list<std::unique_ptr<ConvPostOpInfo>> &post_op_info_list();
+ /** Convolution metadata accessor
+ *
+ * @return Convolution information
+ */
+ PadStrideInfo convolution_info() const;
+ /** Number of groups in convolution accessor
+ *
+ * @return Number of groups in convolution
+ */
+ unsigned int num_groups() const;
+ /** Returns fused activation
+ *
+ * @return Fused activation
+ */
+ ActivationLayerInfo fused_activation() const;
+ /** Sets fused activation
+ *
+ * @param[in] fused_activation Fused activation to set
+ */
+ void set_fused_activation(ActivationLayerInfo fused_activation);
+ /** Sets convolution info
+ *
+ * @param[in] info Convolution info to set
+ */
+ void set_convolution_info(PadStrideInfo info);
+ /** Computes convolution output descriptor
+ *
+ * @param[in] input_descriptor Input descriptor
+ * @param[in] weights_descriptor Weights descriptor
+ * @param[in] info Convolution operation attributes
+ *
+ * @return Output descriptor
+ */
+ static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor,
+ const TensorDescriptor &weights_descriptor,
+ const PadStrideInfo &info);
+
+ // Inherited overridden methods:
+ NodeType type() const override;
+ bool forward_descriptors() override;
+ TensorDescriptor configure_output(size_t idx) const override;
+ void accept(INodeVisitor &v) override;
+
+public:
+ static constexpr NodeType node_type = NodeType::FusedConvolutionWithPostOp;
+
+private:
+ PadStrideInfo _info;
+ unsigned int _num_groups;
+ ConvolutionMethod _method;
+ FastMathHint _fast_math_hint;
+ QuantizationInfo _out_quant_info;
+ ActivationLayerInfo _fused_activation;
+ std::list<std::unique_ptr<ConvPostOpInfo>> _post_op_info_list;
+};
+} // namespace graph
+} // namespace arm_compute
+
+#endif /* ARM_COMPUTE_GRAPH_FUSED_CONVOLUTION_WITH_POST_OP_NODE_H */
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index edb1876722..fb0eb155fd 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020 Arm Limited.
+ * Copyright (c) 2018-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -43,6 +43,7 @@
#include "arm_compute/graph/nodes/FlattenLayerNode.h"
#include "arm_compute/graph/nodes/FullyConnectedLayerNode.h"
#include "arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h"
+#include "arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h"
#include "arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h"
#include "arm_compute/graph/nodes/GenerateProposalsLayerNode.h"
#include "arm_compute/graph/nodes/InputNode.h"
diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h
index 485361296a..6393b1d5d4 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020 Arm Limited.
+ * Copyright (c) 2018-2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -49,6 +49,7 @@ class EltwiseLayerNode;
class FlattenLayerNode;
class FullyConnectedLayerNode;
class FusedConvolutionBatchNormalizationNode;
+class FusedConvolutionWithPostOpNode;
class FusedDepthwiseConvolutionBatchNormalizationNode;
class GenerateProposalsLayerNode;
class InputNode;
diff --git a/arm_compute/graph/printers/DotGraphPrinter.h b/arm_compute/graph/printers/DotGraphPrinter.h
index 3c9de8cba9..41607e831a 100644
--- a/arm_compute/graph/printers/DotGraphPrinter.h
+++ b/arm_compute/graph/printers/DotGraphPrinter.h
@@ -1,4 +1,27 @@
/*
+ * Copyright (c) 2021 Arm Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+/*
* Copyright (c) 2018-2019,2021 Arm Limited.
*
* SPDX-License-Identifier: MIT
@@ -57,6 +80,7 @@ public:
void visit(DepthwiseConvolutionLayerNode &n) override;
void visit(EltwiseLayerNode &n) override;
void visit(FusedConvolutionBatchNormalizationNode &n) override;
+ void visit(FusedConvolutionWithPostOpNode &n) override;
void visit(FusedDepthwiseConvolutionBatchNormalizationNode &n) override;
void visit(NormalizationLayerNode &n) override;
void visit(PoolingLayerNode &n) override;
diff --git a/src/graph/INodeVisitor.cpp b/src/graph/INodeVisitor.cpp
index 2bbf519cf5..ceaaeae7f2 100644
--- a/src/graph/INodeVisitor.cpp
+++ b/src/graph/INodeVisitor.cpp
@@ -85,6 +85,10 @@ void DefaultNodeVisitor::visit(FusedConvolutionBatchNormalizationNode &n)
{
default_visit(n);
}
+void DefaultNodeVisitor::visit(FusedConvolutionWithPostOpNode &n)
+{
+ default_visit(n);
+}
void DefaultNodeVisitor::visit(FusedDepthwiseConvolutionBatchNormalizationNode &n)
{
default_visit(n);
diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp
index 1cd3f9f9c7..838977e75c 100644
--- a/src/graph/backends/CL/CLFunctionsFactory.cpp
+++ b/src/graph/backends/CL/CLFunctionsFactory.cpp
@@ -81,6 +81,7 @@ struct CLFusedLayerTypes
using ConvolutionLayer = CLConvolutionLayer;
using DepthwiseConvolutionLayer = CLDepthwiseConvolutionLayer;
using FuseBatchNormalization = CLFuseBatchNormalization;
+ using GEMMConvolutionLayer = CLGEMMConvolutionLayer;
};
/** Wrapper for the CPP Function in the OpenCL backend **/
@@ -273,6 +274,8 @@ std::unique_ptr<IFunction> CLFunctionFactory::create(INode *node, GraphContext &
return detail::create_fully_connected_layer<CLFullyConnectedLayer, CLTargetInfo>(*polymorphic_downcast<FullyConnectedLayerNode *>(node), ctx);
case NodeType::FusedConvolutionBatchNormalizationLayer:
return detail::create_fused_convolution_batch_normalization_layer<CLFusedLayerTypes, CLTargetInfo>(*polymorphic_downcast<FusedConvolutionBatchNormalizationNode *>(node), ctx);
+ case NodeType::FusedConvolutionWithPostOp:
+ return detail::create_fused_convolution_with_post_op<CLFusedLayerTypes, CLTargetInfo>(*polymorphic_downcast<FusedConvolutionWithPostOpNode *>(node), ctx);
case NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer:
return detail::create_fused_depthwise_convolution_batch_normalization_layer<CLFusedLayerTypes, CLTargetInfo>(*polymorphic_downcast<FusedDepthwiseConvolutionBatchNormalizationNode *>(node), ctx);
case NodeType::GenerateProposalsLayer:
diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp
index 8e3b4c8705..c50782db48 100644
--- a/src/graph/backends/CL/CLNodeValidator.cpp
+++ b/src/graph/backends/CL/CLNodeValidator.cpp
@@ -76,6 +76,8 @@ Status CLNodeValidator::validate(INode *node)
CLDirectConvolutionLayer,
CLGEMMConvolutionLayer,
CLWinogradConvolutionLayer>(*polymorphic_downcast<ConvolutionLayerNode *>(node));
+ case NodeType::FusedConvolutionWithPostOp:
+ return detail::validate_fused_convolution_with_post_op<CLGEMMConvolutionLayer>(*polymorphic_downcast<FusedConvolutionWithPostOpNode *>(node));
case NodeType::DepthToSpaceLayer:
return detail::validate_depth_to_space_layer<CLDepthToSpaceLayer>(*polymorphic_downcast<DepthToSpaceLayerNode *>(node));
case NodeType::DepthwiseConvolutionLayer:
diff --git a/src/graph/mutators/NodeFusionMutator.cpp b/src/graph/mutators/NodeFusionMutator.cpp
index e37164c60c..463d1cd8f6 100644
--- a/src/graph/mutators/NodeFusionMutator.cpp
+++ b/src/graph/mutators/NodeFusionMutator.cpp
@@ -28,12 +28,14 @@
#include "arm_compute/graph/Utils.h"
#include "arm_compute/graph/backends/BackendRegistry.h"
#include "arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h"
+#include "arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h"
#include "arm_compute/graph/nodes/Nodes.h"
#include "src/graph/mutators/MutatorUtils.h"
#include "support/Cast.h"
+#include <list>
#include <set>
namespace arm_compute
@@ -322,13 +324,13 @@ void fuse_layer(Graph &g, std::function<bool(INode &)> const &prec, const F fuse
for(unsigned int i = 0; i < g.nodes().size(); ++i)
{
auto node = g.node(i);
- // Check if the node is of type N and not a branching node
+ // Check if the node is of type N1 and not a branching node
if(node && node->type() == N1::node_type && node->output_edges().size() == 1)
{
const auto output_edge_id = *node->output_edges().begin();
const auto output_edge = g.edge(output_edge_id);
- // Check if following node is an activation layer node
+ // Check if following node is a type N2 node
if((output_edge != nullptr) && (output_edge->consumer() != nullptr) && (output_edge->consumer()->type() == N2::node_type) && prec(*output_edge->producer()))
{
fuse_fcn(g, output_edge, optional_arguments...);
@@ -336,6 +338,266 @@ void fuse_layer(Graph &g, std::function<bool(INode &)> const &prec, const F fuse
}
}
}
+
+/** Fuse below operators:
+ *
+ * | Main operator | Post operators |
+ * |:--------------|:---------------------------|
+ * |conv | add |
+ * |conv | act + add |
+ * |conv | add + act |
+ * |conv | act + add + act |
+ *
+ * Notes: currently, only GEMM supports fusion with post operator
+*/
+template <typename N>
+void fuse_convolution(Graph &g, const Edge *output_edge, int conv_node_id, const std::set<Activation> &supported_fused_activations)
+{
+ ARM_COMPUTE_ERROR_ON(output_edge == nullptr);
+
+ auto *conv_node = arm_compute::utils::cast::polymorphic_downcast<N *>(output_edge->producer());
+ ARM_COMPUTE_ERROR_ON(conv_node->output(0) == nullptr);
+ // Prevent fusion if fused node has an output accessor
+ if(conv_node->output(0)->accessor() == nullptr)
+ {
+ // If data type is FP32/FP16, data layout is NHWC, and filter size if 1x1, fuse convolution with post op, as Conv1x1 always leads to GEMM.
+ const Edge *input_edge = conv_node->input_edge(1);
+ if(input_edge != nullptr && input_edge->tensor() != nullptr)
+ {
+ const DataLayout data_layout = input_edge->tensor()->desc().layout;
+ const DataType data_type = input_edge->tensor()->desc().data_type;
+ const TensorShape tensor_shape = input_edge->tensor()->desc().shape;
+ if(data_layout != DataLayout::NHWC || is_data_type_float(data_type) == false || tensor_shape.y() != 1 || tensor_shape.z() != 1)
+ {
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Prevented fusion of convolution node with post ops due to non GEMM convolution\n");
+ return;
+ }
+ }
+ else
+ {
+ return;
+ }
+
+ std::list<INode *> post_op_node_list = {};
+ int eltwise_adden_input_id = 0;
+ int prev_op_dst_pos = 0; // Previous operator dst's postion in current operator
+ NodeID prev_op_dst_id = conv_node->id();
+ for(unsigned int i = conv_node_id + 1; i < g.nodes().size(); ++i)
+ {
+ auto post_op_node = g.node(i);
+ bool fusable_post_op = false;
+ if(post_op_node != nullptr && post_op_node->output_edges().size() > 0)
+ {
+ const auto post_op_output_edge_id = *post_op_node->output_edges().begin();
+ const auto post_op_output_edge = g.edge(post_op_output_edge_id);
+
+ if(post_op_output_edge != nullptr)
+ {
+ switch(post_op_output_edge->producer()->type())
+ {
+ case EltwiseLayerNode::node_type:
+ {
+ auto *eltwise_node = arm_compute::utils::cast::polymorphic_downcast<EltwiseLayerNode *>(post_op_output_edge->producer());
+ ARM_COMPUTE_ERROR_ON(eltwise_node->output(0) == nullptr);
+ if(eltwise_node->output(0)->accessor() == nullptr)
+ {
+ post_op_node_list.push_back(post_op_output_edge->producer());
+ fusable_post_op = true;
+
+ // Extract elementwise inputs
+ const auto eltwise_input_id_0 = eltwise_node->input_edge(0)->producer_id();
+ const auto eltwise_input_id_1 = eltwise_node->input_edge(1)->producer_id();
+ if(eltwise_input_id_0 == prev_op_dst_id)
+ {
+ eltwise_adden_input_id = eltwise_input_id_1;
+ prev_op_dst_pos = 0;
+ }
+ else if(eltwise_input_id_1 == prev_op_dst_id)
+ {
+ eltwise_adden_input_id = eltwise_input_id_0;
+ prev_op_dst_pos = 1;
+ }
+ }
+ else
+ {
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Prevented fusion of convolution node with elementwise due to the presence of an output accessor\n");
+ }
+ break;
+ }
+ case ActivationLayerNode::node_type:
+ {
+ auto *act_node = arm_compute::utils::cast::polymorphic_downcast<ActivationLayerNode *>(post_op_output_edge->producer());
+ ARM_COMPUTE_ERROR_ON(act_node->output(0) == nullptr);
+ // Check if activation is supported for fusion
+ if(supported_fused_activations.count(act_node->activation_info().activation()) == 0)
+ {
+ break;
+ }
+ if(act_node->output(0)->accessor() == nullptr)
+ {
+ post_op_node_list.push_back(post_op_output_edge->producer());
+ fusable_post_op = true;
+ prev_op_dst_id = act_node->id();
+ }
+ else
+ {
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Prevented fusion of convolution node with activation due to the presence of an output accessor\n");
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ // Check if the node is not a branching node and current node is fusable
+ if(post_op_node->output_edges().size() == 1 && fusable_post_op == true)
+ {
+ continue;
+ }
+ else
+ {
+ break;
+ }
+ }
+ }
+
+ if(post_op_node_list.size() == 0)
+ {
+ return;
+ }
+ else if(post_op_node_list.size() == 1) // Use fusion without post op if post op only contains one activation operator
+ {
+ for(const auto &post_op : post_op_node_list)
+ {
+ if(post_op->type() == ActivationLayerNode::node_type)
+ {
+ post_op_node_list.clear();
+ return;
+ }
+ }
+ }
+ else // Use fusion with post op if there're two or more operators
+ {
+ const Target assigned_target = conv_node->assigned_target();
+
+ // Extract conv inputs
+ const auto conv_input_id = conv_node->input_edge(0)->producer_id();
+ const auto conv_weights_id = conv_node->input_edge(1)->producer_id();
+ const auto conv_info = conv_node->convolution_info();
+ const auto conv_method = conv_node->convolution_method();
+ const auto num_groups = conv_node->num_groups();
+ FastMathHint fast_math_hint = conv_node->fast_math_hint();
+
+ // Create the fused node
+ const NodeID fused_id = g.add_node<FusedConvolutionWithPostOpNode>(conv_info, num_groups, conv_method, fast_math_hint);
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Fusing convolution node with ID : " << conv_node->id());
+
+ // Add connections from the conv inputs to the fused node
+ g.add_connection(conv_input_id, 0, fused_id, 0);
+ g.add_connection(conv_weights_id, 0, fused_id, 1);
+ if(conv_node->input_edge(2) != nullptr)
+ {
+ auto conv_bias_id = conv_node->input_edge(2)->producer_id();
+ g.add_connection(conv_bias_id, 0, fused_id, 2);
+ }
+ g.add_connection(eltwise_adden_input_id, 0, fused_id, 3);
+ g.remove_node(conv_node->id());
+
+ // Update fused node outputs
+ auto fused_node = g.node(fused_id);
+ auto *fused_conv_node = arm_compute::utils::cast::polymorphic_downcast<FusedConvolutionWithPostOpNode *>(fused_node);
+ fused_node->set_assigned_target(assigned_target);
+
+ unsigned int op_idx = 0;
+ // Fuse post operators with conv
+ for(const auto &post_op : post_op_node_list)
+ {
+ switch(post_op->type())
+ {
+ case EltwiseLayerNode::node_type:
+ {
+ auto *eltwise_node = arm_compute::utils::cast::polymorphic_downcast<EltwiseLayerNode *>(post_op);
+ ARM_COMPUTE_ERROR_ON(eltwise_node->output(0) == nullptr);
+
+ fused_conv_node->post_op_info_list().push_back(std::make_unique<ConvPostOpInfoEltwiseAdd>(prev_op_dst_pos, eltwise_node->convert_policy()));
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE(" with Elementwise Layer node with ID : " << post_op->id());
+ break;
+ }
+ case ActivationLayerNode::node_type:
+ {
+ auto *act_node = arm_compute::utils::cast::polymorphic_downcast<ActivationLayerNode *>(post_op);
+ ARM_COMPUTE_ERROR_ON(act_node->output(0) == nullptr);
+
+ fused_conv_node->post_op_info_list().push_back(std::make_unique<ConvPostOpInfoActivation>(act_node->activation_info()));
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE(" with Activation Layer node with ID : " << post_op->id());
+ break;
+ }
+ default:
+ break;
+ }
+
+ if(op_idx == post_op_node_list.size() - 1) // last fusable node
+ {
+ // Get driving nodes of last fusable node
+ std::vector<NodeIdxPair> last_driving_nodes = get_driving_nodes(*post_op);
+
+ // Extract last fusable node accessor if any
+ auto last_node_accessor = post_op->output(0)->extract_accessor();
+
+ // Remove node
+ g.remove_node(post_op->id());
+
+ // Update fused node outputs
+ for(auto &driving_node : last_driving_nodes)
+ {
+ g.add_connection(fused_id, 0, driving_node.node_id, driving_node.index);
+ configure_tensor(fused_node->output(0));
+ }
+
+ // Update accessor to fused node
+ fused_node->output(0)->set_accessor(std::move(last_node_accessor));
+ }
+ else
+ {
+ // Remove node
+ g.remove_node(post_op->id());
+ }
+ op_idx++;
+ }
+ post_op_node_list.clear();
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE(std::endl);
+ }
+ }
+ else
+ {
+ ARM_COMPUTE_LOG_GRAPH_VERBOSE("Prevented fusion of convolution node with post ops due to the presence of an output accessor\n");
+ }
+}
+
+template <typename N1, typename F, typename... Args>
+void fuse_layer(Graph &g, std::function<bool(INode &)> const &prec, const F fuse_fcn, Args &&... optional_arguments)
+{
+ // Note that fused nodes may be added to the end of the node list.
+ // Instead of only looping over the original list of nodes, we loop over the current node list which could be growing.
+ // This is intentional as it probes the newly added fused nodes for further fusing opportunities.
+ for(unsigned int i = 0; i < g.nodes().size(); ++i)
+ {
+ auto node = g.node(i);
+ // Check if the node is of type N1 and not a branching node
+ if(node && node->type() == N1::node_type && node->output_edges().size() == 1)
+ {
+ const auto output_edge_id = *node->output_edges().begin();
+ const auto output_edge = g.edge(output_edge_id);
+
+ // Check if it's the correct target
+ if((output_edge != nullptr) && (output_edge->consumer() != nullptr) && prec(*output_edge->producer()))
+ {
+ fuse_fcn(g, output_edge, i, optional_arguments...);
+ }
+ }
+ }
+}
} // namespace detail
const char *NodeFusionMutator::name()
@@ -381,15 +643,17 @@ void NodeFusionMutator::mutate(Graph &g)
};
// Fusion mutations
+
+ detail::fuse_layer<ConvolutionLayerNode>(g, cl_target_prec, detail::fuse_convolution<ConvolutionLayerNode>, supported_fused_activations);
+ detail::fuse_layer<ConvolutionLayerNode, ActivationLayerNode>(g, empty_prec, detail::fuse_node_with_activation<ConvolutionLayerNode>, supported_fused_activations);
+ detail::fuse_layer<ConvolutionLayerNode, BatchNormalizationLayerNode>(g, empty_prec, detail::fuse_convolution_with_batch_normalization);
detail::fuse_layer<PadLayerNode, ConvolutionLayerNode>(g, empty_prec, detail::fuse_pad_with_convolution<ConvolutionLayerNode>);
detail::fuse_layer<PadLayerNode, DepthwiseConvolutionLayerNode>(g, empty_prec, detail::fuse_pad_with_convolution<DepthwiseConvolutionLayerNode>);
detail::fuse_layer<BatchNormalizationLayerNode, ActivationLayerNode>(g, empty_prec, detail::fuse_node_with_activation<BatchNormalizationLayerNode>, supported_fused_activations);
- detail::fuse_layer<ConvolutionLayerNode, ActivationLayerNode>(g, empty_prec, detail::fuse_node_with_activation<ConvolutionLayerNode>, supported_fused_activations);
detail::fuse_layer<DepthwiseConvolutionLayerNode, ActivationLayerNode>(g, qs8_prec, detail::fuse_node_with_activation<DepthwiseConvolutionLayerNode>, supported_fused_activations);
+ detail::fuse_layer<DepthwiseConvolutionLayerNode, BatchNormalizationLayerNode>(g, empty_prec, detail::fuse_depthwise_convolution_with_batch_normalization);
detail::fuse_layer<FullyConnectedLayerNode, ActivationLayerNode>(g, empty_prec, detail::fuse_node_with_activation<FullyConnectedLayerNode>, supported_fused_activations);
detail::fuse_layer<EltwiseLayerNode, ActivationLayerNode>(g, cl_target_prec, detail::fuse_node_with_activation<EltwiseLayerNode>, supported_fused_activations);
- detail::fuse_layer<ConvolutionLayerNode, BatchNormalizationLayerNode>(g, empty_prec, detail::fuse_convolution_with_batch_normalization);
- detail::fuse_layer<DepthwiseConvolutionLayerNode, BatchNormalizationLayerNode>(g, empty_prec, detail::fuse_depthwise_convolution_with_batch_normalization);
}
} // namespace graph
} // namespace arm_compute
diff --git a/src/graph/nodes/FusedConvolutionWithPostOpNode.cpp b/src/graph/nodes/FusedConvolutionWithPostOpNode.cpp
new file mode 100644
index 0000000000..c7ca59d863
--- /dev/null
+++ b/src/graph/nodes/FusedConvolutionWithPostOpNode.cpp
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2021 Arm Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "arm_compute/graph/nodes/FusedConvolutionWithPostOpNode.h"
+
+#include "arm_compute/core/Utils.h"
+#include "arm_compute/graph/Graph.h"
+#include "arm_compute/graph/INodeVisitor.h"
+#include "arm_compute/graph/Utils.h"
+
+namespace arm_compute
+{
+namespace graph
+{
+FusedConvolutionWithPostOpNode::FusedConvolutionWithPostOpNode(PadStrideInfo info,
+ unsigned int num_groups,
+ 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(std::move(out_quant_info)), _fused_activation(),
+ _post_op_info_list(std::list<std::unique_ptr<ConvPostOpInfo>> {})
+{
+ _input_edges.resize(4, EmptyEdgeID);
+ _outputs.resize(1, NullTensorID);
+}
+
+void FusedConvolutionWithPostOpNode::set_convolution_method(ConvolutionMethod method)
+{
+ _method = method;
+}
+
+ConvolutionMethod FusedConvolutionWithPostOpNode::convolution_method() const
+{
+ return _method;
+}
+
+void FusedConvolutionWithPostOpNode::set_fast_math_hint(FastMathHint hint)
+{
+ _fast_math_hint = hint;
+}
+
+FastMathHint FusedConvolutionWithPostOpNode::fast_math_hint() const
+{
+ return _fast_math_hint;
+}
+
+const std::list<std::unique_ptr<ConvPostOpInfo>> &FusedConvolutionWithPostOpNode::post_op_info_list() const
+{
+ return _post_op_info_list;
+}
+
+std::list<std::unique_ptr<ConvPostOpInfo>> &FusedConvolutionWithPostOpNode::post_op_info_list()
+{
+ return _post_op_info_list;
+}
+
+PadStrideInfo FusedConvolutionWithPostOpNode::convolution_info() const
+{
+ return _info;
+}
+
+unsigned int FusedConvolutionWithPostOpNode::num_groups() const
+{
+ return _num_groups;
+}
+
+ActivationLayerInfo FusedConvolutionWithPostOpNode::fused_activation() const
+{
+ return _fused_activation;
+}
+
+void FusedConvolutionWithPostOpNode::set_fused_activation(ActivationLayerInfo fused_activation)
+{
+ _fused_activation = fused_activation;
+}
+
+void FusedConvolutionWithPostOpNode::set_convolution_info(PadStrideInfo info)
+{
+ _info = info;
+}
+
+TensorDescriptor FusedConvolutionWithPostOpNode::compute_output_descriptor(const TensorDescriptor &input_descriptor,
+ const TensorDescriptor &weights_descriptor,
+ const PadStrideInfo &info)
+{
+ unsigned int output_width = 0;
+ unsigned int output_height = 0;
+
+ const unsigned int input_width = get_dimension_size(input_descriptor, DataLayoutDimension::WIDTH);
+ const unsigned int input_height = get_dimension_size(input_descriptor, DataLayoutDimension::HEIGHT);
+ const unsigned int kernel_width = get_dimension_size(weights_descriptor, DataLayoutDimension::WIDTH);
+ const unsigned int kernel_height = get_dimension_size(weights_descriptor, DataLayoutDimension::HEIGHT);
+
+ std::tie(output_width, output_height) = scaled_dimensions(input_width, input_height, kernel_width, kernel_height, info);
+
+ const DataLayout data_layout = input_descriptor.layout;
+ TensorDescriptor output_descriptor = input_descriptor;
+ output_descriptor.shape.set(get_dimension_idx(data_layout, DataLayoutDimension::WIDTH), output_width);
+ output_descriptor.shape.set(get_dimension_idx(data_layout, DataLayoutDimension::HEIGHT), output_height);
+ output_descriptor.shape.set(get_dimension_idx(data_layout, DataLayoutDimension::CHANNEL), weights_descriptor.shape[3]);
+
+ return output_descriptor;
+}
+
+bool FusedConvolutionWithPostOpNode::forward_descriptors()
+{
+ if((input_id(0) != NullTensorID) && (input_id(1) != NullTensorID) && (output_id(0) != NullTensorID))
+ {
+ Tensor *dst = output(0);
+ ARM_COMPUTE_ERROR_ON(dst == nullptr);
+ dst->desc() = configure_output(0);
+ return true;
+ }
+ return false;
+}
+
+TensorDescriptor FusedConvolutionWithPostOpNode::configure_output(size_t idx) const
+{
+ ARM_COMPUTE_UNUSED(idx);
+ const Tensor *src = input(0);
+ const Tensor *weights = input(1);
+
+ ARM_COMPUTE_ERROR_ON(src == nullptr || weights == nullptr);
+
+ TensorDescriptor output_info = compute_output_descriptor(src->desc(), weights->desc(), _info);
+ if(!_out_quant_info.empty())
+ {
+ output_info.quant_info = _out_quant_info;
+ }
+
+ return output_info;
+}
+
+NodeType FusedConvolutionWithPostOpNode::type() const
+{
+ return FusedConvolutionWithPostOpNode::node_type;
+}
+
+void FusedConvolutionWithPostOpNode::accept(INodeVisitor &v)
+{
+ v.visit(*this);
+}
+} // namespace graph
+} // namespace arm_compute
diff --git a/src/graph/printers/DotGraphPrinter.cpp b/src/graph/printers/DotGraphPrinter.cpp
index 08f7f25ee5..47371e34d5 100644
--- a/src/graph/printers/DotGraphPrinter.cpp
+++ b/src/graph/printers/DotGraphPrinter.cpp
@@ -85,6 +85,14 @@ void DotGraphVisitor::visit(FusedConvolutionBatchNormalizationNode &n)
_info = ss.str();
}
+void DotGraphVisitor::visit(FusedConvolutionWithPostOpNode &n)
+{
+ ARM_COMPUTE_UNUSED(n);
+ std::stringstream ss;
+ ss << "FusedConvolutionWithPostOpNode";
+ _info = ss.str();
+}
+
void DotGraphVisitor::visit(FusedDepthwiseConvolutionBatchNormalizationNode &n)
{
ARM_COMPUTE_UNUSED(n);