IVGCVSW-2752 Make biases optional in INetwork

* Added new version of AddConvolution2dLayer, AddDepthwiseConvolution2dLayer
  and AddFullyConnectedLayer with Optional<ConstTensor> biases
* Deprecated old AddConvolution2dLayer, AddDepthwiseConvolution2dLayer
  and AddFullyConnectedLayer methods
* Made necessary changes to implementation functions

Change-Id: I65eddb28dc72a9c74429c331815a96c2bfdc8c51
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>

1 files changed, 42 insertions, 20 deletions

diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp
index 3754c2e6d1..e50ce79052 100644
--- a/src/armnn/Network.hpp
+++ b/src/armnn/Network.hpp
@@ -38,24 +38,39 @@ public:
                                               const char* name = nullptr) override;
 
     IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor,
-        const ConstTensor& weights,
-        const char* name = nullptr) override;
+                                             const ConstTensor& weights,
+                                             const Optional<ConstTensor>& biases,
+                                             const char* name = nullptr) override;
+
+    /// @deprecated
+    IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor,
+                                             const ConstTensor& weights,
+                                             const char* name = nullptr) override;
 
+    /// @deprecated
     IConnectableLayer* AddConvolution2dLayer(const Convolution2dDescriptor& convolution2dDescriptor,
+                                             const ConstTensor& weights,
+                                             const ConstTensor& biases,
+                                             const char* name = nullptr) override;
+
+    IConnectableLayer* AddDepthwiseConvolution2dLayer(
+        const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
         const ConstTensor& weights,
-        const ConstTensor& biases,
+        const Optional<ConstTensor>& biases,
         const char* name = nullptr) override;
 
+    /// @deprecated
     IConnectableLayer* AddDepthwiseConvolution2dLayer(
         const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
-        const ConstTensor&                      weights,
-        const char*                             name = nullptr) override;
+        const ConstTensor& weights,
+        const char* name = nullptr) override;
 
+    /// @deprecated
     IConnectableLayer* AddDepthwiseConvolution2dLayer(
         const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
-        const ConstTensor&                      weights,
-        const ConstTensor&                      biases,
-        const char*                             name = nullptr) override;
+        const ConstTensor& weights,
+        const ConstTensor& biases,
+        const char* name = nullptr) override;
 
     IConnectableLayer* AddDetectionPostProcessLayer(
         const DetectionPostProcessDescriptor& descriptor,
@@ -63,13 +78,20 @@ public:
         const char* name = nullptr) override;
 
     IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor,
-        const ConstTensor& weights,
-        const char* name = nullptr) override;
+                                              const ConstTensor& weights,
+                                              const Optional<ConstTensor>& biases,
+                                              const char* name = nullptr) override;
 
+    /// @deprecated
     IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor,
-        const ConstTensor& weights,
-        const ConstTensor& biases,
-        const char* name = nullptr) override;
+                                              const ConstTensor& weights,
+                                              const char* name = nullptr) override;
+
+    /// @deprecated
+    IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor,
+                                              const ConstTensor& weights,
+                                              const ConstTensor& biases,
+                                              const char* name = nullptr) override;
 
     IConnectableLayer* AddGatherLayer(const char* name = nullptr) override;
 
@@ -152,19 +174,19 @@ public:
 
 private:
     IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor,
-        const ConstTensor& weights,
-        const ConstTensor* biases,
-        const char* name);
+                                                  const ConstTensor& weights,
+                                                  const Optional<ConstTensor>& biases,
+                                                  const char* name);
 
     IConnectableLayer* AddConvolution2dLayerImpl(const Convolution2dDescriptor& convolution2dDescriptor,
-        const ConstTensor& weights,
-        const ConstTensor* biases,
-        const char* name);
+                                                 const ConstTensor& weights,
+                                                 const Optional<ConstTensor>& biases,
+                                                 const char* name);
 
     IConnectableLayer* AddDepthwiseConvolution2dLayerImpl(
         const DepthwiseConvolution2dDescriptor& convolution2dDescriptor,
         const ConstTensor& weights,
-        const ConstTensor* biases,
+        const Optional<ConstTensor>& biases,
         const char* name);
 
     std::unique_ptr<Graph> m_Graph;