From ac2770a4bb6461bfbddec928bb6208f26f898f02 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Wed, 1 Apr 2020 16:51:23 +0100 Subject: IVGCVSW-4485 Remove Boost assert * Change boost assert to armnn assert * Change include file to armnn assert * Fix ARMNN_ASSERT_MSG issue with multiple conditions * Change BOOST_ASSERT to BOOST_TEST where appropriate * Remove unused include statements Signed-off-by: Narumol Prangnawarat Change-Id: I5d0fa3a37b7c1c921216de68f0073aa34702c9ff --- src/armnn/layers/LstmLayer.cpp | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'src/armnn/layers/LstmLayer.cpp') diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp index 1d945690d5..653b18a1c9 100644 --- a/src/armnn/layers/LstmLayer.cpp +++ b/src/armnn/layers/LstmLayer.cpp @@ -147,7 +147,7 @@ LstmLayer* LstmLayer::Clone(Graph& graph) const std::vector LstmLayer::InferOutputShapes(const std::vector& inputShapes) const { - BOOST_ASSERT(inputShapes.size() == 3); + ARMNN_ASSERT(inputShapes.size() == 3); // Get input values for validation unsigned int batchSize = inputShapes[0][0]; @@ -173,35 +173,35 @@ void LstmLayer::ValidateTensorShapesFromInputs() GetInputSlot(2).GetConnection()->GetTensorInfo().GetShape()} ); - BOOST_ASSERT(inferredShapes.size() == 4); + ARMNN_ASSERT(inferredShapes.size() == 4); // Check if the weights are nullptr - BOOST_ASSERT_MSG(m_BasicParameters.m_InputToForgetWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_InputToForgetWeights != nullptr, "LstmLayer: m_BasicParameters.m_InputToForgetWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_InputToCellWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_InputToCellWeights != nullptr, "LstmLayer: m_BasicParameters.m_InputToCellWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_InputToOutputWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_InputToOutputWeights != nullptr, "LstmLayer: m_BasicParameters.m_InputToOutputWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_RecurrentToForgetWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_RecurrentToForgetWeights != nullptr, "LstmLayer: m_BasicParameters.m_RecurrentToForgetWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_RecurrentToCellWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_RecurrentToCellWeights != nullptr, "LstmLayer: m_BasicParameters.m_RecurrentToCellWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_RecurrentToOutputWeights != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_RecurrentToOutputWeights != nullptr, "LstmLayer: m_BasicParameters.m_RecurrentToOutputWeights should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_ForgetGateBias != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_ForgetGateBias != nullptr, "LstmLayer: m_BasicParameters.m_ForgetGateBias should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_CellBias != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_CellBias != nullptr, "LstmLayer: m_BasicParameters.m_CellBias should not be null."); - BOOST_ASSERT_MSG(m_BasicParameters.m_OutputGateBias != nullptr, + ARMNN_ASSERT_MSG(m_BasicParameters.m_OutputGateBias != nullptr, "LstmLayer: m_BasicParameters.m_OutputGateBias should not be null."); if (!m_Param.m_CifgEnabled) { - BOOST_ASSERT_MSG(m_CifgParameters.m_InputToInputWeights != nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_InputToInputWeights != nullptr, "LstmLayer: m_CifgParameters.m_InputToInputWeights should not be null."); - BOOST_ASSERT_MSG(m_CifgParameters.m_RecurrentToInputWeights != nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_RecurrentToInputWeights != nullptr, "LstmLayer: m_CifgParameters.m_RecurrentToInputWeights should not be null."); - BOOST_ASSERT_MSG(m_CifgParameters.m_InputGateBias != nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_InputGateBias != nullptr, "LstmLayer: m_CifgParameters.m_InputGateBias should not be null."); ConditionalThrowIfNotEqual( @@ -211,11 +211,11 @@ void LstmLayer::ValidateTensorShapesFromInputs() } else { - BOOST_ASSERT_MSG(m_CifgParameters.m_InputToInputWeights == nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_InputToInputWeights == nullptr, "LstmLayer: m_CifgParameters.m_InputToInputWeights should not have a value when CIFG is enabled."); - BOOST_ASSERT_MSG(m_CifgParameters.m_RecurrentToInputWeights == nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_RecurrentToInputWeights == nullptr, "LstmLayer: m_CifgParameters.m_RecurrentToInputWeights should not have a value when CIFG is enabled."); - BOOST_ASSERT_MSG(m_CifgParameters.m_InputGateBias == nullptr, + ARMNN_ASSERT_MSG(m_CifgParameters.m_InputGateBias == nullptr, "LstmLayer: m_CifgParameters.m_InputGateBias should not have a value when CIFG is enabled."); ConditionalThrowIfNotEqual( @@ -226,7 +226,7 @@ void LstmLayer::ValidateTensorShapesFromInputs() if (m_Param.m_ProjectionEnabled) { - BOOST_ASSERT_MSG(m_ProjectionParameters.m_ProjectionWeights != nullptr, + ARMNN_ASSERT_MSG(m_ProjectionParameters.m_ProjectionWeights != nullptr, "LstmLayer: m_ProjectionParameters.m_ProjectionWeights should not be null."); } @@ -234,13 +234,13 @@ void LstmLayer::ValidateTensorShapesFromInputs() { if (!m_Param.m_CifgEnabled) { - BOOST_ASSERT_MSG(m_PeepholeParameters.m_CellToInputWeights != nullptr, + ARMNN_ASSERT_MSG(m_PeepholeParameters.m_CellToInputWeights != nullptr, "LstmLayer: m_PeepholeParameters.m_CellToInputWeights should not be null " "when Peephole is enabled and CIFG is disabled."); } - BOOST_ASSERT_MSG(m_PeepholeParameters.m_CellToForgetWeights != nullptr, + ARMNN_ASSERT_MSG(m_PeepholeParameters.m_CellToForgetWeights != nullptr, "LstmLayer: m_PeepholeParameters.m_CellToForgetWeights should not be null."); - BOOST_ASSERT_MSG(m_PeepholeParameters.m_CellToOutputWeights != nullptr, + ARMNN_ASSERT_MSG(m_PeepholeParameters.m_CellToOutputWeights != nullptr, "LstmLayer: m_PeepholeParameters.m_CellToOutputWeights should not be null."); } @@ -261,14 +261,14 @@ void LstmLayer::ValidateTensorShapesFromInputs() { if(!m_Param.m_CifgEnabled) { - BOOST_ASSERT_MSG(m_LayerNormParameters.m_InputLayerNormWeights != nullptr, + ARMNN_ASSERT_MSG(m_LayerNormParameters.m_InputLayerNormWeights != nullptr, "LstmLayer: m_LayerNormParameters.m_inputLayerNormWeights should not be null."); } - BOOST_ASSERT_MSG(m_LayerNormParameters.m_ForgetLayerNormWeights != nullptr, + ARMNN_ASSERT_MSG(m_LayerNormParameters.m_ForgetLayerNormWeights != nullptr, "LstmLayer: m_LayerNormParameters.m_forgetLayerNormWeights should not be null."); - BOOST_ASSERT_MSG(m_LayerNormParameters.m_CellLayerNormWeights != nullptr, + ARMNN_ASSERT_MSG(m_LayerNormParameters.m_CellLayerNormWeights != nullptr, "LstmLayer: m_LayerNormParameters.m_cellLayerNormWeights should not be null."); - BOOST_ASSERT_MSG(m_LayerNormParameters.m_OutputLayerNormWeights != nullptr, + ARMNN_ASSERT_MSG(m_LayerNormParameters.m_OutputLayerNormWeights != nullptr, "LstmLayer: m_LayerNormParameters.m_outputLayerNormWeights should not be null."); } } -- cgit v1.2.1