Added add with convolution fusion

mryzhov · Mar 13, 2023 · 6cddb63 · 6cddb63
1 parent dc705e3
commit 6cddb63
Show file tree

Hide file tree

Showing 6 changed files with 501 additions and 0 deletions.
diff --git a/src/plugins/intel_gna/src/gna_transformations_pipeline.cpp b/src/plugins/intel_gna/src/gna_transformations_pipeline.cpp
@@ -55,6 +55,7 @@
 #include "transformations/swap_input_matmul_gna.hpp"
 #include "transformations/unfuse_reshape_and_transpose.hpp"
 #include "transformations/utils/utils.hpp"
+#include "transformations/fuse_conv_biasadd_activation.hpp"
 
 #include "debug_new_pass.hpp"
 #include "transformations/transpose_nchw.hpp"
@@ -124,6 +125,7 @@ void TransformationsPipeline::apply(const std::shared_ptr<ov::Model>& model,
     manager.register_pass<ov::intel_gna::pass::GatherSinkingGeneral>();
     manager.register_pass<ov::pass::ReshapeSequenceFusion>();
     manager.register_pass<ov::pass::TransposeToReshape>();
+    manager.register_pass<ov::intel_gna::pass::GnaConvolutionFusion>();
     manager.register_pass<ov::intel_gna::pass::RemoveInputsProcessing>(subgraph_cpu_map);
     manager.register_pass<ov::intel_gna::pass::RemoveOutputsProcessing>(subgraph_cpu_map);
     manager.register_pass<ov::pass::ConvertOpSet3ToOpSet2>();

diff --git a/src/plugins/intel_gna/src/ops/gna_convolution.hpp b/src/plugins/intel_gna/src/ops/gna_convolution.hpp
@@ -43,6 +43,20 @@ void shape_infer(const ov::intel_gna::op::GNAConvolution* op,
 
 } // namespace internal
 
+/**
+ * @brief Activation modes for fused convolutions.
+ *
+ */
+enum class ActivationType { SIGMOID,
+                            RELU,
+                            TANH,
+                            ABS,
+                            LOG,
+                            EXP,
+                            SIGN,
+                            CLAMP,
+                            NO_ACTIVATION };
+
 /// \brief Convolution with NHWC layout
 ///
 class GNAConvolution : public ov::op::Op {
@@ -127,6 +141,9 @@ class GNAConvolution : public ov::op::Op {
     void set_auto_pad(const ov::op::PadType& auto_pad) {
         m_auto_pad = auto_pad;
     }
+    bool has_add_node() const { return m_has_add_node; }
+    ActivationType get_activation() const { return m_activation_type; }
+    void set_activation(ActivationType activation_type) { m_activation_type = activation_type; }
 
     /*
      * TODO: for unit tests
@@ -166,6 +183,8 @@ class GNAConvolution : public ov::op::Op {
                             const ngraph::CoordinateDiff& pads_end,
                             const std::vector<T>& input_shapes,
                             std::vector<T>& output_shapes);
+    bool m_has_add_node;
+    ActivationType m_activation_type;
 };
 } // namespace op
 } // namespace intel_gna