From c013bc85f45add8c4bc8c7163316bbb90b37a15e Mon Sep 17 00:00:00 2001 From: Rob Hughes Date: Wed, 14 Jul 2021 09:31:31 +0100 Subject: Fix some compile warnings & errors * Fix type of literals * Add explicit casts * #include missing headers * Replace use of non-standard u_int8_t * Remove name of unused variables * Fix DLL export macro - this was broken when some of the exporting headers were moved to a different library. Change-Id: Ie569c8df41a077b46c608798f39526352e2aeb3a Signed-off-by: Rob Hughes --- src/backends/backendsCommon/test/OptimizedNetworkTests.cpp | 4 ++-- src/backends/backendsCommon/test/layerTests/CastTestImpl.cpp | 2 +- .../backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp | 2 ++ src/backends/reference/workloads/BaseIterator.hpp | 2 +- src/backends/reference/workloads/Reduce.cpp | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp index dcea9ef72e..012737e1d7 100644 --- a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp +++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp @@ -96,7 +96,7 @@ TEST_CASE("OptimizeValidateDeviceNonSupportLayerNoFallback") Optimize(*net, backends, runtime->GetDeviceSpec(), armnn::OptimizerOptions(), errMessages); FAIL("Should have thrown an exception."); } - catch (const armnn::InvalidArgumentException& e) + catch (const armnn::InvalidArgumentException&) { // Different exceptions are thrown on different backends } @@ -216,7 +216,7 @@ TEST_CASE("OptimizeValidateWorkloadsUndefinedComputeDevice") Optimize(*net, backends, runtime->GetDeviceSpec(), armnn::OptimizerOptions(), errMessages); FAIL("Should have thrown an exception."); } - catch (const armnn::InvalidArgumentException& e) + catch (const armnn::InvalidArgumentException&) { // Different exceptions are thrown on different backends } diff --git a/src/backends/backendsCommon/test/layerTests/CastTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/CastTestImpl.cpp index aec57dbad1..92bce4f460 100644 --- a/src/backends/backendsCommon/test/layerTests/CastTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/CastTestImpl.cpp @@ -113,7 +113,7 @@ LayerTestResult CastUInt8ToFloat2dTest(armnn::IWorkloadFactory& worklo const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, const armnn::ITensorHandleFactory& tensorHandleFactory) { - std::vector inputValues = { 1, 3, 1, 3, 1, 3, 1, 3, 1, + std::vector inputValues = { 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 2, 1, 3, 1, 3 }; std::vector outputValues = { 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 2.0f, 1.0f, 3.0f, 1.0f, 3.0f }; diff --git a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp index e242fd31d3..11c9766604 100644 --- a/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/L2NormalizationTestImpl.cpp @@ -16,6 +16,8 @@ #include +#include + namespace { diff --git a/src/backends/reference/workloads/BaseIterator.hpp b/src/backends/reference/workloads/BaseIterator.hpp index 483ef720f9..e09371fd96 100644 --- a/src/backends/reference/workloads/BaseIterator.hpp +++ b/src/backends/reference/workloads/BaseIterator.hpp @@ -456,7 +456,7 @@ public: for (uint32_t i = 0; i < size; ++i) { this->operator[](i); - decodedTensor.emplace_back(*m_Iterator); + decodedTensor.emplace_back(static_cast(*m_Iterator)); } return decodedTensor; diff --git a/src/backends/reference/workloads/Reduce.cpp b/src/backends/reference/workloads/Reduce.cpp index 392ef8e5ba..8bf422aea3 100644 --- a/src/backends/reference/workloads/Reduce.cpp +++ b/src/backends/reference/workloads/Reduce.cpp @@ -85,7 +85,7 @@ void Reduce(const TensorInfo& inputInfo, { case ReduceOperation::Mean: case ReduceOperation::Sum: - std::fill(tempOut.begin(), tempOut.end(), 0.0); + std::fill(tempOut.begin(), tempOut.end(), 0.0f); break; case ReduceOperation::Max: std::fill(tempOut.begin(), tempOut.end(), -1 * std::numeric_limits::max()); -- cgit v1.2.1