Release 18.05

1 files changed, 5 insertions, 2 deletions

diff --git a/src/armnn/backends/RefWorkloads/ConvImpl.hpp b/src/armnn/backends/RefWorkloads/ConvImpl.hpp
index ecc5b14687..8b66b0b7d2 100644
--- a/src/armnn/backends/RefWorkloads/ConvImpl.hpp
+++ b/src/armnn/backends/RefWorkloads/ConvImpl.hpp
@@ -57,6 +57,11 @@ static void ConvImpl(ConvData data,
                      int32_t outputOffset,
                      bool depthwise = false)
 {
+    if (data.m_Parameters.m_BiasEnabled && !biasData)
+    {
+        throw InvalidArgumentException("Bias is enabled but the bias data is invalid");
+    }
+
     const TensorInfo& inputInfo0 = GetTensorInfo(data.m_Inputs[0]);
     const TensorInfo& outputInfo0 = GetTensorInfo(data.m_Outputs[0]);
     const TensorInfo& filterInfo = data.m_Weight->GetTensorInfo();
@@ -65,8 +70,6 @@ static void ConvImpl(ConvData data,
     unsigned int channelsInput  = filterInfo.GetShape()[1];
     unsigned int channelsOutput = depthwise ? channelsInput * depthMult : filterInfo.GetShape()[0];
 
-    BOOST_ASSERT(data.m_Parameters.m_BiasEnabled == false || biasData != nullptr);
-
     unsigned int batchSize    = outputInfo0.GetShape()[0];
     unsigned int heightOutput = outputInfo0.GetShape()[2];
     unsigned int widthOutput  = outputInfo0.GetShape()[3];