From bb46dde88befe14583eaac83f65775a7543d4586 Mon Sep 17 00:00:00 2001 From: Rob Hughes Date: Wed, 20 May 2020 15:27:37 +0100 Subject: Fix a few build warnings: * Remove redundant asserts for unsigned ints being positive * Remove unneeded include of lightweight_test.hpp header * Remove unused exception variable names * Replace hardcoded 0.0f with T() for some template functions * Add a few static_casts Change-Id: I290b0433cf995f6d0199422eaa10f816e5fd8eb9 Signed-off-by: Robert Hughes --- src/armnn/test/UtilityTests.cpp | 1 - src/armnnTfLiteParser/test/GetBuffer.cpp | 2 +- .../backendsCommon/test/JsonPrinterTestImpl.cpp | 4 +- .../test/layerTests/Conv2dTestImpl.cpp | 6 +- .../test/layerTests/LstmTestImpl.cpp | 76 +++++++++++----------- .../layerTests/TransposeConvolution2dTestImpl.cpp | 2 +- src/profiling/test/ProfilingMocks.hpp | 8 +-- src/profiling/test/SendCounterPacketTests.cpp | 4 +- 8 files changed, 51 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/src/armnn/test/UtilityTests.cpp b/src/armnn/test/UtilityTests.cpp index af56364b15..8d933eb435 100644 --- a/src/armnn/test/UtilityTests.cpp +++ b/src/armnn/test/UtilityTests.cpp @@ -4,7 +4,6 @@ // #include -#include #define ARMNN_POLYMORPHIC_CAST_TESTABLE #define ARMNN_NUMERIC_CAST_TESTABLE diff --git a/src/armnnTfLiteParser/test/GetBuffer.cpp b/src/armnnTfLiteParser/test/GetBuffer.cpp index 6eecf4f8ee..cccdbce7aa 100644 --- a/src/armnnTfLiteParser/test/GetBuffer.cpp +++ b/src/armnnTfLiteParser/test/GetBuffer.cpp @@ -120,7 +120,7 @@ BOOST_FIXTURE_TEST_CASE(GetBufferCheckParseException, GetBufferFixture) { //Check if armnn::ParseException thrown when invalid buffer index used TfLiteParser::ModelPtr model = TfLiteParser::LoadModelFromBinary(m_GraphBinary.data(), m_GraphBinary.size()); - BOOST_CHECK_THROW(TfLiteParser::GetBuffer(model, 4)->data.empty(), armnn::Exception); + BOOST_CHECK_THROW(TfLiteParser::GetBuffer(model, 4), armnn::Exception); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp index 2aa713f1ed..50dc61b1f4 100644 --- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp @@ -65,7 +65,7 @@ std::vector ExtractMeasurements(const std::string& exp) armnn::stringUtils::StringTrim(numberString, "\t,\n"); numbers.push_back(std::stod(numberString)); } - catch (std::invalid_argument const& e) + catch (std::invalid_argument const&) { BOOST_FAIL("Could not convert measurements to double: " + numberString); } @@ -80,7 +80,7 @@ std::vector ExtractMeasurements(const std::string& exp) armnn::stringUtils::StringTrim(numberString, "\t,\n"); numbers.push_back(std::stod(numberString)); } - catch (std::invalid_argument const& e) + catch (std::invalid_argument const&) { BOOST_FAIL("Could not convert measurements to double: " + numberString); } diff --git a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp index 154ece2657..acc888ebc0 100644 --- a/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/Conv2dTestImpl.cpp @@ -76,7 +76,7 @@ boost::multi_array GetBias2(bool biasEnabled, float qScale) if(biasEnabled) { armnn::TensorInfo biasDesc({static_cast(Bias2.size())}, ArmnnType); - boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias2, qScale, 0.0f)); + boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias2, qScale, 0)); return bias; } else @@ -92,7 +92,7 @@ boost::multi_array GetBias4(bool biasEnabled, float qScale) if(biasEnabled) { armnn::TensorInfo biasDesc({static_cast(Bias4.size())}, ArmnnType); - boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias4, qScale, 0.0f)); + boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias4, qScale, 0)); return bias; } else @@ -108,7 +108,7 @@ boost::multi_array GetBias8(bool biasEnabled, float qScale) if(biasEnabled) { armnn::TensorInfo biasDesc({static_cast(Bias4.size())}, ArmnnType); - boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias8, qScale, 0.0f)); + boost::multi_array bias = MakeTensor(biasDesc, QuantizedVector(Bias8, qScale, 0)); return bias; } else diff --git a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp index 0ae55e4c60..c7f902ab04 100644 --- a/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/LstmTestImpl.cpp @@ -160,28 +160,28 @@ LstmNoCifgNoPeepholeNoProjectionTestImpl( LayerTestResult ret(outputTensorInfo); - std::vector inputVector; + std::vector inputVector; inputVector.assign(input.data(), input.data() + (batchSize * inputSize)); - auto inputTensor = MakeTensor(inputTensorInfo, inputVector); + auto inputTensor = MakeTensor(inputTensorInfo, inputVector); - std::vector cellStateInVector(batchSize * numUnits, 0.f); - auto cellStateInTensor = MakeTensor(cellStateInTensorInfo, cellStateInVector); + std::vector cellStateInVector(batchSize * numUnits, T()); + auto cellStateInTensor = MakeTensor(cellStateInTensorInfo, cellStateInVector); - std::vector outputStateInVector(batchSize * outputSize, 0.f); - auto outputStateInTensor = MakeTensor(outputStateInTensorInfo, outputStateInVector); + std::vector outputStateInVector(batchSize * outputSize, T()); + auto outputStateInTensor = MakeTensor(outputStateInTensorInfo, outputStateInVector); - std::vector scratchBufferVector(batchSize * numUnits * 4, 0.f); - auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); + std::vector scratchBufferVector(batchSize * numUnits * 4, T()); + auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); - std::vector outputStateOutVector(batchSize * outputSize, 0.f); - auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); + std::vector outputStateOutVector(batchSize * outputSize, T()); + auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); - std::vector cellStateOutVector(batchSize * numUnits, 0.f); - auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); + std::vector cellStateOutVector(batchSize * numUnits, T()); + auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); - std::vector outputVector; + std::vector outputVector; outputVector.assign(outputExpected.data(), outputExpected.data() + (batchSize * outputSize)); - ret.outputExpected = MakeTensor(outputTensorInfo, outputVector); + ret.outputExpected = MakeTensor(outputTensorInfo, outputVector); std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr cellStateInHandle = @@ -363,28 +363,28 @@ LstmLayerNoCifgWithPeepholeWithProjectionTestImpl(armnn::IWorkloadFactory& workl LayerTestResult ret(outputTensorInfo); - std::vector inputVector; + std::vector inputVector; inputVector.assign(input.data(), input.data() + (batchSize * inputSize)); - auto inputTensor = MakeTensor(inputTensorInfo, inputVector); + auto inputTensor = MakeTensor(inputTensorInfo, inputVector); - std::vector cellStateInVector(batchSize * numUnits, 0.f); - auto cellStateInTensor = MakeTensor(cellStateInTensorInfo, cellStateInVector); + std::vector cellStateInVector(batchSize * numUnits, T()); + auto cellStateInTensor = MakeTensor(cellStateInTensorInfo, cellStateInVector); - std::vector outputStateInVector(batchSize * outputSize, 0.f); - auto outputStateInTensor = MakeTensor(outputStateInTensorInfo, outputStateInVector); + std::vector outputStateInVector(batchSize * outputSize, T()); + auto outputStateInTensor = MakeTensor(outputStateInTensorInfo, outputStateInVector); - std::vector scratchBufferVector(batchSize * numUnits * 4, 0.f); - auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); + std::vector scratchBufferVector(batchSize * numUnits * 4, T()); + auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); - std::vector outputStateOutVector(batchSize * outputSize, 0.f); - auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); + std::vector outputStateOutVector(batchSize * outputSize, T()); + auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); - std::vector cellStateOutVector(batchSize * numUnits, 0.f); - auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); + std::vector cellStateOutVector(batchSize * numUnits, T()); + auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); - std::vector outputVector; + std::vector outputVector; outputVector.assign(outputExpected.data(), outputExpected.data() + (batchSize * outputSize)); - ret.outputExpected = MakeTensor(outputTensorInfo, outputVector); + ret.outputExpected = MakeTensor(outputTensorInfo, outputVector); std::unique_ptr inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr cellStateInHandle = @@ -1195,27 +1195,27 @@ LayerTestResult LstmLayerWithCifgWithPeepholeNoProjectionTestImpl( // List of outputs - std::vector scratchBufferVector(batchSize * scratchBufferSize, 0.f); - auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); + std::vector scratchBufferVector(batchSize * scratchBufferSize, T()); + auto scratchBufferTensor = MakeTensor(scratchBufferTensorInfo, scratchBufferVector); LayerTestResult ret0(scratchBufferTensorInfo); // Output state for a certain time step - std::vector outputStateOutVector(batchSize * outputSize, 0.f); - auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); + std::vector outputStateOutVector(batchSize * outputSize, T()); + auto outputStateOutTensor = MakeTensor(outputStateOutTensorInfo, outputStateOutVector); LayerTestResult ret1(outputStateOutTensorInfo); // Cell state for a certain time step - std::vector cellStateOutVector(batchSize * cellSize, 0.f); - auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); + std::vector cellStateOutVector(batchSize * cellSize, T()); + auto cellStateOutTensor = MakeTensor(cellStateOutTensorInfo, cellStateOutVector); LayerTestResult ret2(cellStateOutTensorInfo); // Output for a certain time step - std::vector outputVector(batchSize * outputSize, 0.f); - auto outputTensor = MakeTensor(outputTensorInfo, outputVector); - std::vector outputData; + std::vector outputVector(batchSize * outputSize, T()); + auto outputTensor = MakeTensor(outputTensorInfo, outputVector); + std::vector outputData; outputData.assign(outputExpected.data(), outputExpected.data() + batchSize*outputSize); LayerTestResult ret3(outputTensorInfo); - ret3.outputExpected = MakeTensor(outputTensorInfo, outputData); + ret3.outputExpected = MakeTensor(outputTensorInfo, outputData); // Prepare the inputs and outputs for the workload std::unique_ptr inputHandle = diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index 813c623cff..a599bae4b5 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -105,7 +105,7 @@ void TransposeConvolution2dTestImpl(armnn::IWorkloadFactory& workloadFactory, ExecuteWorkload(*workload, memoryManager); // copy output - output.second = std::vector(output.first.GetNumElements(), 0.0f); + output.second = std::vector(output.first.GetNumElements(), T()); CopyDataFromITensorHandle(output.second.data(), outputHandle.get()); } diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 2cd44c40a2..28e410fb9a 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -111,12 +111,12 @@ public: if(packetInfo.second != 0) { - return std::count(m_WrittenData.begin(), m_WrittenData.end(), packetInfo); + return static_cast(std::count(m_WrittenData.begin(), m_WrittenData.end(), packetInfo)); } else { - return std::count_if(m_WrittenData.begin(), m_WrittenData.end(), - [&packetInfo](const std::pair pair) { return packetInfo.first == pair.first; }); + return static_cast(std::count_if(m_WrittenData.begin(), m_WrittenData.end(), + [&packetInfo](const std::pair pair) { return packetInfo.first == pair.first; })); } } @@ -142,7 +142,7 @@ public: { std::lock_guard lock(m_Mutex); - return m_WrittenData.size(); + return static_cast(m_WrittenData.size()); } void Clear() diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index e7e2312cb4..dc9671bcc8 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -2273,7 +2273,7 @@ BOOST_AUTO_TEST_CASE(SendThreadSendStreamMetadataPacket3) // Check that the buffer contains at least one Stream Metadata packet and no other packets const auto writtenDataSize = mockProfilingConnection.GetWrittenDataSize(); - BOOST_TEST(writtenDataSize >= 1); + BOOST_TEST(writtenDataSize >= 1u); BOOST_TEST(mockProfilingConnection.CheckForPacket( {PacketType::StreamMetaData, streamMetadataPacketsize}) == writtenDataSize); } @@ -2319,7 +2319,7 @@ BOOST_AUTO_TEST_CASE(SendThreadSendStreamMetadataPacket4) // Check that the buffer contains at least one Stream Metadata packet and no other packets const auto writtenDataSize = mockProfilingConnection.GetWrittenDataSize(); - BOOST_TEST(writtenDataSize >= 1); + BOOST_TEST(writtenDataSize >= 1u); BOOST_TEST(mockProfilingConnection.CheckForPacket( {PacketType::StreamMetaData, streamMetadataPacketsize}) == writtenDataSize); } -- cgit v1.2.1