commit ed324051794a262a7694acfb0a378724d6ba8401
author James Conroy <james.conroy@arm.com> Mon May 18 15:16:42 2020 +0100
committer James Conroy <james.conroy@arm.com> Mon May 18 15:22:15 2020 +0100
tree 32d516998be61052492ef1555d778615ee489412
parent 63b234c6f5dd1340d8a7c5f64d7e1bbbe3e2d8df

IVGCVSW-4449 Add missing QLstm nullptr checks

* Adds missing nullptr checks for peephole bias for
  QLstm.

Signed-off-by: James Conroy <james.conroy@arm.com>
Change-Id: Ib04c8352141977cc7ea11a4859f1b11d46472722

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index c2bf27a..a047297 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1874,15 +1874,16 @@
             throw InvalidArgumentException("AddQLstmLayer: Projection Weights cannot be NULL");
         }
 
-        if(params.m_ProjectionBias == nullptr)
-        {
-            throw InvalidArgumentException("AddQLstmLayer: Projection Biases cannot be NULL");
-        }
-
         layer->m_ProjectionParameters.m_ProjectionWeights =
                 std::make_unique<ScopedCpuTensorHandle>(*(params.m_ProjectionWeights));
-        layer->m_ProjectionParameters.m_ProjectionBias =
-                std::make_unique<ScopedCpuTensorHandle>(*(params.m_ProjectionBias));
+
+        // Projection bias is optional even if projection is enabled
+        if(params.m_ProjectionWeights != nullptr)
+        {
+            layer->m_ProjectionParameters.m_ProjectionBias =
+                    std::make_unique<ScopedCpuTensorHandle>(*(params.m_ProjectionBias));
+        }
+
     }
 
     // QLstm Peephole params

src/armnn/layers/QLstmLayer.cpp

diff --git a/src/armnn/layers/QLstmLayer.cpp b/src/armnn/layers/QLstmLayer.cpp
index 9b940c1..7e61548 100644
--- a/src/armnn/layers/QLstmLayer.cpp
+++ b/src/armnn/layers/QLstmLayer.cpp
@@ -232,8 +232,6 @@
     {
         ARMNN_ASSERT_MSG(m_ProjectionParameters.m_ProjectionWeights != nullptr,
                          "QLstmLayer: m_ProjectionParameters.m_ProjectionWeights should not be null.");
-        ARMNN_ASSERT_MSG(m_ProjectionParameters.m_ProjectionBias != nullptr,
-                         "QLstmLayer: m_ProjectionParameters.m_ProjectionBias should not be null.");
     }
 
     if (m_Param.m_PeepholeEnabled)

src/backends/backendsCommon/WorkloadFactory.cpp

diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp
index c55c70a..34bfd7c 100644
--- a/src/backends/backendsCommon/WorkloadFactory.cpp
+++ b/src/backends/backendsCommon/WorkloadFactory.cpp
@@ -795,7 +795,12 @@
             if(descriptor.m_ProjectionEnabled)
             {
                 paramsInfo.m_ProjectionWeights = &cLayer->m_ProjectionParameters.m_ProjectionWeights->GetTensorInfo();
-                paramsInfo.m_ProjectionBias = &cLayer->m_ProjectionParameters.m_ProjectionBias->GetTensorInfo();
+
+                // Projection bias is optional even if projection is enabled
+                if (cLayer->m_ProjectionParameters.m_ProjectionBias != nullptr)
+                {
+                    paramsInfo.m_ProjectionBias = &cLayer->m_ProjectionParameters.m_ProjectionBias->GetTensorInfo();
+                }
             }
 
             if(descriptor.m_PeepholeEnabled)