From bffb41e06c1276af00e1605ef934d05fa61f7127 Mon Sep 17 00:00:00 2001
From: Manuel Bottini <manuel.bottini@arm.com>
Date: Thu, 20 Jun 2019 16:00:27 +0100
Subject: COMPMID-2273: Fuse Batch Normalization with Depthwise Convolution
 layer at graph level (only for CL)

Change-Id: I1d941c6e66722f39583bf68148c980bb28ff89a1
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1423
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
---
 src/graph/backends/CL/CLFunctionsFactory.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/graph/backends/CL/CLFunctionsFactory.cpp')

diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp
index c14100ab42..b9f22f6199 100644
--- a/src/graph/backends/CL/CLFunctionsFactory.cpp
+++ b/src/graph/backends/CL/CLFunctionsFactory.cpp
@@ -74,8 +74,9 @@ struct CLEltwiseFunctions
 /** Function and tensor types to be used inside a CL fused convolution/batch normalization layer */
 struct CLFusedLayerTypes
 {
-    using ConvolutionLayer       = CLConvolutionLayer;
-    using FuseBatchNormalization = CLFuseBatchNormalization;
+    using ConvolutionLayer          = CLConvolutionLayer;
+    using DepthwiseConvolutionLayer = CLDepthwiseConvolutionLayer;
+    using FuseBatchNormalization    = CLFuseBatchNormalization;
 };
 
 // TODO (isagot01): Remove once we support heterogeneous scheduling at function level
@@ -203,6 +204,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));
+        case NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer:
+            return detail::create_fused_depthwise_convolution_batch_normalization_layer<CLFusedLayerTypes, CLTargetInfo>(*polymorphic_downcast<FusedDepthwiseConvolutionBatchNormalizationNode *>(node));
         case NodeType::GenerateProposalsLayer:
             return detail::create_generate_proposals_layer<CLGenerateProposalsLayer, CLTargetInfo>(*polymorphic_downcast<GenerateProposalsLayerNode *>(node), ctx);
         case NodeType::NormalizationLayer:
-- 
cgit v1.2.1