IVGCVSW-6550 Synchronize include/armnn and PyArmNN swig modules.

* armnn_network.i: IVGCVSW-6127 ConstTensorsAsInput:
  DepthwiseConvolution2d.
* armnn_descriptors.i: IVGCVSW-6127 ConstTensorsAsInput:
  DepthwiseConvolution2d. MLCE-604 Add Unidirectional Sequence
  Lstm support to TFLite. MLCE-530 Add support for
  UnidirectionalSequenceLstm to RefWorkload

Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I0c054db17dbf9a1eb14c12d1fd1337f8003a92d3

1 files changed, 19 insertions, 4 deletions

diff --git a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
index 74ae8c1cd2..a2f57a3aa9 100644
--- a/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
+++ b/python/pyarmnn/src/pyarmnn/swig/modules/armnn_network.i
@@ -534,6 +534,22 @@ public:
 
     %feature("docstring",
         "
+        Adds a 2D Depthwise Convolution layer to the network.
+
+        Args:
+            convolution2dDescriptor (DepthwiseConvolution2dDescriptor): Description of the 2D depthwise convolution layer.
+            name (str): Optional name for the layer.
+
+        Returns:
+            IConnectableLayer: Interface for configuring the layer.
+        ") AddDepthwiseConvolution2dLayer;
+
+    armnn::IConnectableLayer* AddDepthwiseConvolution2dLayer(
+        const armnn::DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
+        const char* name = nullptr);
+
+    %feature("docstring",
+        "
         Adds a Dequantize layer to the network.
 
         Args:
@@ -544,7 +560,6 @@ public:
         ") AddDequantizeLayer;
     armnn::IConnectableLayer* AddDequantizeLayer(const char* name = nullptr);
 
-
     %feature("docstring",
         "
         Adds a Detection PostProcess layer to the network. Detection PostProcess is a custom layer for SSD MobilenetV1.
@@ -869,7 +884,6 @@ public:
     armnn::IConnectableLayer* AddQuantizedLstmLayer(const armnn::QuantizedLstmInputParams& params,
                                                      const char* name = nullptr);
 
-
     %feature("docstring",
         "
         Adds a Rank layer to the network.
@@ -924,7 +938,6 @@ public:
     armnn::IConnectableLayer* AddResizeLayer(const armnn::ResizeDescriptor& resizeDescriptor,
                                               const char* name = nullptr);
 
-
     %feature("docstring",
         "
         Adds a Shape layer to the network.
@@ -1184,7 +1197,6 @@ public:
         }
     }
 
-
     %feature("docstring",
         "
         Adds a 2D Depthwise Convolution layer to the network.
@@ -1205,6 +1217,7 @@ public:
         const armnn::ConstTensor* biases = nullptr,
         const char* name = nullptr) {
 
+        ARMNN_NO_DEPRECATE_WARN_BEGIN
         if (biases) {
             return $self->AddDepthwiseConvolution2dLayer(convolution2dDescriptor, weights,
                                                  armnn::Optional<armnn::ConstTensor>(*biases), name);
@@ -1212,7 +1225,9 @@ public:
             return $self->AddDepthwiseConvolution2dLayer(convolution2dDescriptor, weights,
                                                  armnn::Optional<armnn::ConstTensor>(), name);
         }
+        ARMNN_NO_DEPRECATE_WARN_END
     }
+
 }
 
 %feature("docstring",