MLCE-101: Adding dilation support in conv and dconv

Added support for dilation in DepthwiseConvolution2d in the
Neon and CL backends.

Change-Id: Ie1522b498c07f80d6efcf9dc79e926c8cfa06ca5
Signed-off-by: Pablo Tello <pablo.tello@arm.com>

1 files changed, 22 insertions, 1 deletions

diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp
index 320d9cef74..831a846092 100644
--- a/src/armnn/LayerSupport.cpp
+++ b/src/armnn/LayerSupport.cpp
@@ -186,7 +186,28 @@ bool IsDepthwiseConvolutionSupported(const BackendId& backend,
                                      char* reasonIfUnsupported,
                                      size_t reasonIfUnsupportedMaxLength)
 {
-    FORWARD_LAYER_SUPPORT_FUNC(backend, IsDepthwiseConvolutionSupported, input, output, descriptor, weights, biases);
+    if (descriptor.m_DilationX == 1 && descriptor.m_DilationY == 1)
+    {
+        // Pre 19.05 ArmNN did not have the dilation parameters.
+        // This version of IsDepthwiseConvolutionSupported is called for backwards-compatibility
+        FORWARD_LAYER_SUPPORT_FUNC(backend,
+                                   IsDepthwiseConvolutionSupported,
+                                   input,
+                                   output,
+                                   descriptor,
+                                   weights,
+                                   biases);
+    }
+    else
+    {
+        FORWARD_LAYER_SUPPORT_FUNC(backend,
+                                   IsDilatedDepthwiseConvolutionSupported,
+                                   input,
+                                   output,
+                                   descriptor,
+                                   weights,
+                                   biases);
+    }
 }
 
 bool IsDequantizeSupported(const BackendId& backend,