diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CaffePreprocessor.cpp | 1 | ||||
-rw-r--r-- | tests/DeepSpeechV1InferenceTest.hpp | 8 | ||||
-rw-r--r-- | tests/ExecuteNetwork/ExecuteNetwork.cpp | 2 | ||||
-rw-r--r-- | tests/ImagePreprocessor.cpp | 1 | ||||
-rw-r--r-- | tests/InferenceModel.hpp | 3 | ||||
-rw-r--r-- | tests/InferenceTest.cpp | 7 | ||||
-rw-r--r-- | tests/InferenceTest.inl | 10 | ||||
-rw-r--r-- | tests/InferenceTestImage.cpp | 3 | ||||
-rw-r--r-- | tests/MnistDatabase.cpp | 2 | ||||
-rw-r--r-- | tests/MobileNetSsdInferenceTest.hpp | 10 | ||||
-rw-r--r-- | tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp | 2 | ||||
-rw-r--r-- | tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp | 2 | ||||
-rw-r--r-- | tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp | 2 | ||||
-rw-r--r-- | tests/YoloDatabase.cpp | 1 | ||||
-rw-r--r-- | tests/YoloInferenceTest.hpp | 6 | ||||
-rw-r--r-- | tests/profiling/gatordmock/GatordMockService.cpp | 2 | ||||
-rw-r--r-- | tests/profiling/gatordmock/tests/GatordMockTests.cpp | 4 |
17 files changed, 33 insertions, 33 deletions
diff --git a/tests/CaffePreprocessor.cpp b/tests/CaffePreprocessor.cpp index 6adc75dc64..7e7028966c 100644 --- a/tests/CaffePreprocessor.cpp +++ b/tests/CaffePreprocessor.cpp @@ -6,7 +6,6 @@ #include "CaffePreprocessor.hpp" #include <boost/numeric/conversion/cast.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <iostream> diff --git a/tests/DeepSpeechV1InferenceTest.hpp b/tests/DeepSpeechV1InferenceTest.hpp index 07b55d2ab8..7a33d34ace 100644 --- a/tests/DeepSpeechV1InferenceTest.hpp +++ b/tests/DeepSpeechV1InferenceTest.hpp @@ -7,9 +7,9 @@ #include "InferenceTest.hpp" #include "DeepSpeechV1Database.hpp" +#include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> -#include <boost/assert.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/tools/floating_point_comparison.hpp> @@ -40,13 +40,13 @@ public: { armnn::IgnoreUnused(options); const std::vector<float>& output1 = boost::get<std::vector<float>>(this->GetOutputs()[0]); // logits - BOOST_ASSERT(output1.size() == k_OutputSize1); + ARMNN_ASSERT(output1.size() == k_OutputSize1); const std::vector<float>& output2 = boost::get<std::vector<float>>(this->GetOutputs()[1]); // new_state_c - BOOST_ASSERT(output2.size() == k_OutputSize2); + ARMNN_ASSERT(output2.size() == k_OutputSize2); const std::vector<float>& output3 = boost::get<std::vector<float>>(this->GetOutputs()[2]); // new_state_h - BOOST_ASSERT(output3.size() == k_OutputSize3); + ARMNN_ASSERT(output3.size() == k_OutputSize3); // Check each output to see whether it is the expected value for (unsigned int j = 0u; j < output1.size(); j++) diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp index a59f58074b..9252a463cb 100644 --- a/tests/ExecuteNetwork/ExecuteNetwork.cpp +++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp @@ -127,7 +127,7 @@ int main(int argc, const char* argv[]) // Coverity points out that default_value(...) can throw a bad_lexical_cast, // and that desc.add_options() can throw boost::io::too_few_args. // They really won't in any of these cases. - BOOST_ASSERT_MSG(false, "Caught unexpected exception"); + ARMNN_ASSERT_MSG(false, "Caught unexpected exception"); ARMNN_LOG(fatal) << "Fatal internal error: " << e.what(); return EXIT_FAILURE; } diff --git a/tests/ImagePreprocessor.cpp b/tests/ImagePreprocessor.cpp index f0184e466e..5a42b8ae31 100644 --- a/tests/ImagePreprocessor.cpp +++ b/tests/ImagePreprocessor.cpp @@ -11,7 +11,6 @@ #include <armnnUtils/Permute.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <iostream> diff --git a/tests/InferenceModel.hpp b/tests/InferenceModel.hpp index 0529770b85..af931f99f8 100644 --- a/tests/InferenceModel.hpp +++ b/tests/InferenceModel.hpp @@ -7,6 +7,7 @@ #include <armnn/ArmNN.hpp> #include <armnn/BackendRegistry.hpp> +#include <armnn/utility/Assert.hpp> #if defined(ARMNN_SERIALIZER) #include "armnnDeserializer/IDeserializer.hpp" @@ -179,7 +180,7 @@ public: std::vector<armnn::BindingPointInfo>& outputBindings) { auto parser(IParser::Create()); - BOOST_ASSERT(parser); + ARMNN_ASSERT(parser); armnn::INetworkPtr network{nullptr, [](armnn::INetwork *){}}; diff --git a/tests/InferenceTest.cpp b/tests/InferenceTest.cpp index c6e5011ae4..7e165b5137 100644 --- a/tests/InferenceTest.cpp +++ b/tests/InferenceTest.cpp @@ -4,11 +4,12 @@ // #include "InferenceTest.hpp" +#include <armnn/utility/Assert.hpp> + #include "../src/armnn/Profiling.hpp" #include <boost/algorithm/string.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/filesystem/path.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <boost/program_options.hpp> #include <boost/filesystem/operations.hpp> @@ -55,7 +56,7 @@ bool ParseCommandLine(int argc, char** argv, IInferenceTestCaseProvider& testCas // Coverity points out that default_value(...) can throw a bad_lexical_cast, // and that desc.add_options() can throw boost::io::too_few_args. // They really won't in any of these cases. - BOOST_ASSERT_MSG(false, "Caught unexpected exception"); + ARMNN_ASSERT_MSG(false, "Caught unexpected exception"); std::cerr << "Fatal internal error: " << e.what() << std::endl; return false; } @@ -228,7 +229,7 @@ bool InferenceTest(const InferenceTestOptions& params, success = false; break; default: - BOOST_ASSERT_MSG(false, "Unexpected TestCaseResult"); + ARMNN_ASSERT_MSG(false, "Unexpected TestCaseResult"); return false; } } diff --git a/tests/InferenceTest.inl b/tests/InferenceTest.inl index 5b9b45a4a2..ed16464787 100644 --- a/tests/InferenceTest.inl +++ b/tests/InferenceTest.inl @@ -4,10 +4,10 @@ // #include "InferenceTest.hpp" +#include <armnn/utility/Assert.hpp> #include <boost/algorithm/string.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/filesystem/path.hpp> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <boost/program_options.hpp> #include <boost/filesystem/operations.hpp> @@ -80,7 +80,7 @@ struct ClassifierResultProcessor : public boost::static_visitor<> void operator()(const std::vector<int>& values) { IgnoreUnused(values); - BOOST_ASSERT_MSG(false, "Non-float predictions output not supported."); + ARMNN_ASSERT_MSG(false, "Non-float predictions output not supported."); } ResultMap& GetResultMap() { return m_ResultMap; } @@ -360,9 +360,9 @@ int ClassifierInferenceTestMain(int argc, const armnn::TensorShape* inputTensorShape) { - BOOST_ASSERT(modelFilename); - BOOST_ASSERT(inputBindingName); - BOOST_ASSERT(outputBindingName); + ARMNN_ASSERT(modelFilename); + ARMNN_ASSERT(inputBindingName); + ARMNN_ASSERT(outputBindingName); return InferenceTestMain(argc, argv, defaultTestCaseIds, [=] diff --git a/tests/InferenceTestImage.cpp b/tests/InferenceTestImage.cpp index 83c5cce346..1cf73caf45 100644 --- a/tests/InferenceTestImage.cpp +++ b/tests/InferenceTestImage.cpp @@ -4,6 +4,7 @@ // #include "InferenceTestImage.hpp" +#include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <boost/format.hpp> @@ -165,7 +166,7 @@ std::tuple<uint8_t, uint8_t, uint8_t> InferenceTestImage::GetPixelAs3Channels(un const unsigned int pixelOffset = x * GetNumChannels() + y * GetWidth() * GetNumChannels(); const uint8_t* const pixelData = m_Data.data() + pixelOffset; - BOOST_ASSERT(pixelData <= (m_Data.data() + GetSizeInBytes())); + ARMNN_ASSERT(pixelData <= (m_Data.data() + GetSizeInBytes())); std::array<uint8_t, 3> outPixelData; outPixelData.fill(0); diff --git a/tests/MnistDatabase.cpp b/tests/MnistDatabase.cpp index bd5029f841..c1c5f635b6 100644 --- a/tests/MnistDatabase.cpp +++ b/tests/MnistDatabase.cpp @@ -7,7 +7,7 @@ #include <armnn/Logging.hpp> #include <boost/numeric/conversion/cast.hpp> -#include <boost/assert.hpp> + #include <fstream> #include <vector> diff --git a/tests/MobileNetSsdInferenceTest.hpp b/tests/MobileNetSsdInferenceTest.hpp index a26712c511..e02a4acedd 100644 --- a/tests/MobileNetSsdInferenceTest.hpp +++ b/tests/MobileNetSsdInferenceTest.hpp @@ -7,9 +7,9 @@ #include "InferenceTest.hpp" #include "MobileNetSsdDatabase.hpp" +#include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> -#include <boost/assert.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/test/tools/floating_point_comparison.hpp> @@ -38,16 +38,16 @@ public: armnn::IgnoreUnused(options); const std::vector<float>& output1 = boost::get<std::vector<float>>(this->GetOutputs()[0]); // bounding boxes - BOOST_ASSERT(output1.size() == k_OutputSize1); + ARMNN_ASSERT(output1.size() == k_OutputSize1); const std::vector<float>& output2 = boost::get<std::vector<float>>(this->GetOutputs()[1]); // classes - BOOST_ASSERT(output2.size() == k_OutputSize2); + ARMNN_ASSERT(output2.size() == k_OutputSize2); const std::vector<float>& output3 = boost::get<std::vector<float>>(this->GetOutputs()[2]); // scores - BOOST_ASSERT(output3.size() == k_OutputSize3); + ARMNN_ASSERT(output3.size() == k_OutputSize3); const std::vector<float>& output4 = boost::get<std::vector<float>>(this->GetOutputs()[3]); // valid detections - BOOST_ASSERT(output4.size() == k_OutputSize4); + ARMNN_ASSERT(output4.size() == k_OutputSize4); const size_t numDetections = boost::numeric_cast<size_t>(output4[0]); diff --git a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp index ecfc21209c..dd1c295d37 100644 --- a/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp +++ b/tests/ModelAccuracyTool-Armnn/ModelAccuracyTool-Armnn.cpp @@ -109,7 +109,7 @@ int main(int argc, char* argv[]) // Coverity points out that default_value(...) can throw a bad_lexical_cast, // and that desc.add_options() can throw boost::io::too_few_args. // They really won't in any of these cases. - BOOST_ASSERT_MSG(false, "Caught unexpected exception"); + ARMNN_ASSERT_MSG(false, "Caught unexpected exception"); std::cerr << "Fatal internal error: " << e.what() << std::endl; return 1; } diff --git a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp index 5c969c68dd..0e72f7bc1e 100644 --- a/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp +++ b/tests/MultipleNetworksCifar10/MultipleNetworksCifar10.cpp @@ -59,7 +59,7 @@ int main(int argc, char* argv[]) // Coverity points out that default_value(...) can throw a bad_lexical_cast, // and that desc.add_options() can throw boost::io::too_few_args. // They really won't in any of these cases. - BOOST_ASSERT_MSG(false, "Caught unexpected exception"); + ARMNN_ASSERT_MSG(false, "Caught unexpected exception"); std::cerr << "Fatal internal error: " << e.what() << std::endl; return 1; } diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp index a0aeb8bc5a..278ba1b46a 100644 --- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp +++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp @@ -824,7 +824,7 @@ int RunCsvTest(const armnnUtils::CsvRow &csvRow, const std::shared_ptr<armnn::IR // Coverity points out that default_value(...) can throw a bad_lexical_cast, // and that desc.add_options() can throw boost::io::too_few_args. // They really won't in any of these cases. - BOOST_ASSERT_MSG(false, "Caught unexpected exception"); + ARMNN_ASSERT_MSG(false, "Caught unexpected exception"); ARMNN_LOG(fatal) << "Fatal internal error: " << e.what(); return EXIT_FAILURE; } diff --git a/tests/YoloDatabase.cpp b/tests/YoloDatabase.cpp index 98db8d4871..3b3e5a90d4 100644 --- a/tests/YoloDatabase.cpp +++ b/tests/YoloDatabase.cpp @@ -12,7 +12,6 @@ #include <tuple> #include <utility> -#include <boost/assert.hpp> #include <boost/format.hpp> #include <boost/numeric/conversion/cast.hpp> diff --git a/tests/YoloInferenceTest.hpp b/tests/YoloInferenceTest.hpp index 4190e72365..6c783d3c48 100644 --- a/tests/YoloInferenceTest.hpp +++ b/tests/YoloInferenceTest.hpp @@ -7,13 +7,13 @@ #include "InferenceTest.hpp" #include "YoloDatabase.hpp" +#include <armnn/utility/Assert.hpp> #include <armnn/utility/IgnoreUnused.hpp> #include <algorithm> #include <array> #include <utility> -#include <boost/assert.hpp> #include <boost/multi_array.hpp> #include <boost/test/tools/floating_point_comparison.hpp> @@ -39,7 +39,7 @@ public: using Boost3dArray = boost::multi_array<float, 3>; const std::vector<float>& output = boost::get<std::vector<float>>(this->GetOutputs()[0]); - BOOST_ASSERT(output.size() == YoloOutputSize); + ARMNN_ASSERT(output.size() == YoloOutputSize); constexpr Boost3dArray::index gridSize = 7; constexpr Boost3dArray::index numClasses = 20; @@ -96,7 +96,7 @@ public: } } } - BOOST_ASSERT(output.data() + YoloOutputSize == outputPtr); + ARMNN_ASSERT(output.data() + YoloOutputSize == outputPtr); std::vector<YoloDetectedObject> detectedObjects; detectedObjects.reserve(gridSize * gridSize * numScales * numClasses); diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp index 3e19c25b6c..aad335dc4d 100644 --- a/tests/profiling/gatordmock/GatordMockService.cpp +++ b/tests/profiling/gatordmock/GatordMockService.cpp @@ -362,7 +362,7 @@ armnn::profiling::Packet GatordMockService::ReceivePacket() profiling::CommandHandlerFunctor* commandHandlerFunctor = m_HandlerRegistry.GetFunctor(packetRx.GetPacketFamily(), packetRx.GetPacketId(), version.GetEncodedValue()); - BOOST_ASSERT(commandHandlerFunctor); + ARMNN_ASSERT(commandHandlerFunctor); commandHandlerFunctor->operator()(packetRx); return packetRx; } diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp index 7417946844..f8b42df674 100644 --- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp +++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp @@ -98,11 +98,11 @@ BOOST_AUTO_TEST_CASE(CounterCaptureHandlingTest) commandHandler(packet1); commandHandler(packet2); - BOOST_ASSERT(commandHandler.m_CurrentPeriodValue == 5000); + ARMNN_ASSERT(commandHandler.m_CurrentPeriodValue == 5000); for (size_t i = 0; i < commandHandler.m_CounterCaptureValues.m_Uids.size(); ++i) { - BOOST_ASSERT(commandHandler.m_CounterCaptureValues.m_Uids[i] == i); + ARMNN_ASSERT(commandHandler.m_CounterCaptureValues.m_Uids[i] == i); } } |