diff options
Diffstat (limited to 'src/armnnDeserializer')
36 files changed, 179 insertions, 216 deletions
diff --git a/src/armnnDeserializer/test/DeserializeAbs.cpp b/src/armnnDeserializer/test/DeserializeAbs.cpp index 97f9b50e06..bb03ecd1a5 100644 --- a/src/armnnDeserializer/test/DeserializeAbs.cpp +++ b/src/armnnDeserializer/test/DeserializeAbs.cpp @@ -3,14 +3,15 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> -#include <string> +#include <doctest/doctest.h> -BOOST_AUTO_TEST_SUITE(Deserializer) +#include <string> +TEST_SUITE("Deserializer_Abs") +{ struct AbsFixture : public ParserFlatbuffersSerializeFixture { explicit AbsFixture(const std::string &inputShape, @@ -108,7 +109,7 @@ BOOST_AUTO_TEST_SUITE(Deserializer) {} }; - BOOST_FIXTURE_TEST_CASE(SimpleAbsTest, SimpleAbsFixture) + TEST_CASE_FIXTURE(SimpleAbsFixture, "SimpleAbsTest") { RunTest<4, armnn::DataType::Float32>( 0, @@ -116,4 +117,4 @@ BOOST_AUTO_TEST_SUITE(Deserializer) {{"OutputLayer", { 100.0f, 50.5f, 25.9999f, 0.5f , 0.0f, 1.5555f, 25.5f, 100.0f }}}); } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeActivation.cpp b/src/armnnDeserializer/test/DeserializeActivation.cpp index a5f71c9959..dc3dcb4394 100644 --- a/src/armnnDeserializer/test/DeserializeActivation.cpp +++ b/src/armnnDeserializer/test/DeserializeActivation.cpp @@ -3,14 +3,15 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> -#include <string> +#include <doctest/doctest.h> -BOOST_AUTO_TEST_SUITE(DeserializeParser) +#include <string> +TEST_SUITE("DeserializeParser_Activation") +{ struct ActivationFixture : public ParserFlatbuffersSerializeFixture { explicit ActivationFixture(const std::string& inputShape, @@ -141,7 +142,7 @@ struct SimpleActivationFixture4 : ActivationFixture }; -BOOST_FIXTURE_TEST_CASE(ActivationReluQuantisedAsymm8, SimpleActivationFixture) +TEST_CASE_FIXTURE(SimpleActivationFixture, "ActivationReluQuantisedAsymm8") { RunTest<4, armnn::DataType::QAsymmU8>( 0, @@ -149,7 +150,7 @@ BOOST_FIXTURE_TEST_CASE(ActivationReluQuantisedAsymm8, SimpleActivationFixture) {{"OutputLayer", {10, 0, 2, 0}}}); } -BOOST_FIXTURE_TEST_CASE(ActivationReluFloat32, SimpleActivationFixture2) +TEST_CASE_FIXTURE(SimpleActivationFixture2, "ActivationReluFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -158,7 +159,7 @@ BOOST_FIXTURE_TEST_CASE(ActivationReluFloat32, SimpleActivationFixture2) } -BOOST_FIXTURE_TEST_CASE(ActivationBoundedReluQuantisedAsymm8, SimpleActivationFixture3) +TEST_CASE_FIXTURE(SimpleActivationFixture3, "ActivationBoundedReluQuantisedAsymm8") { RunTest<4, armnn::DataType::QAsymmU8>( 0, @@ -166,7 +167,7 @@ BOOST_FIXTURE_TEST_CASE(ActivationBoundedReluQuantisedAsymm8, SimpleActivationFi {{"OutputLayer", {5, 0, 2, 0}}}); } -BOOST_FIXTURE_TEST_CASE(ActivationBoundedReluFloat32, SimpleActivationFixture4) +TEST_CASE_FIXTURE(SimpleActivationFixture4, "ActivationBoundedReluFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -174,4 +175,4 @@ BOOST_FIXTURE_TEST_CASE(ActivationBoundedReluFloat32, SimpleActivationFixture4) {{"OutputLayer", {5, 0, 5, 3}}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeAdd.cpp b/src/armnnDeserializer/test/DeserializeAdd.cpp index 01612086ed..b2a645be55 100644 --- a/src/armnnDeserializer/test/DeserializeAdd.cpp +++ b/src/armnnDeserializer/test/DeserializeAdd.cpp @@ -3,16 +3,17 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <armnn/utility/IgnoreUnused.hpp> -#include <string> +#include <doctest/doctest.h> -BOOST_AUTO_TEST_SUITE(Deserializer) +#include <string> +TEST_SUITE("Deserializer_Add") +{ struct AddFixture : public ParserFlatbuffersSerializeFixture { explicit AddFixture(const std::string & inputShape1, @@ -142,7 +143,7 @@ struct SimpleAddFixture2 : AddFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(AddQuantisedAsymm8, SimpleAddFixture) +TEST_CASE_FIXTURE(SimpleAddFixture, "AddQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -151,7 +152,7 @@ BOOST_FIXTURE_TEST_CASE(AddQuantisedAsymm8, SimpleAddFixture) {{"OutputLayer", { 4, 6, 8, 10 }}}); } -BOOST_FIXTURE_TEST_CASE(AddFloat32, SimpleAddFixture2) +TEST_CASE_FIXTURE(SimpleAddFixture2, "AddFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -160,4 +161,4 @@ BOOST_FIXTURE_TEST_CASE(AddFloat32, SimpleAddFixture2) {{"OutputLayer", { 116, 93, 236, 15 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeArgMinMax.cpp b/src/armnnDeserializer/test/DeserializeArgMinMax.cpp index 6358b538dc..5a792283d8 100644 --- a/src/armnnDeserializer/test/DeserializeArgMinMax.cpp +++ b/src/armnnDeserializer/test/DeserializeArgMinMax.cpp @@ -3,15 +3,14 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include "../Deserializer.hpp" #include <string> #include <iostream> -BOOST_AUTO_TEST_SUITE(DeserializeParser) - +TEST_SUITE("DeserializeParser_ArgMinMax") +{ struct ArgMinMaxFixture : public ParserFlatbuffersSerializeFixture { explicit ArgMinMaxFixture(const std::string& inputShape, @@ -123,7 +122,7 @@ struct SimpleArgMinMaxFixture : public ArgMinMaxFixture "Max") {} }; -BOOST_FIXTURE_TEST_CASE(ArgMinMax, SimpleArgMinMaxFixture) +TEST_CASE_FIXTURE(SimpleArgMinMaxFixture, "ArgMinMax") { RunTest<3, armnn::DataType::Float32, armnn::DataType::Signed64>( 0, @@ -131,4 +130,4 @@ BOOST_FIXTURE_TEST_CASE(ArgMinMax, SimpleArgMinMaxFixture) {{"OutputLayer",{ 3l }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp b/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp index ba3f01ee5f..03eb3717bd 100644 --- a/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeBatchNormalization.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_BatchNormalization") +{ struct BatchNormalizationFixture : public ParserFlatbuffersSerializeFixture { explicit BatchNormalizationFixture(const std::string &inputShape, @@ -159,7 +158,7 @@ struct BatchNormFixture : BatchNormalizationFixture "NHWC"){} }; -BOOST_FIXTURE_TEST_CASE(BatchNormalizationFloat32, BatchNormFixture) +TEST_CASE_FIXTURE(BatchNormFixture, "BatchNormalizationFloat32") { RunTest<4, armnn::DataType::Float32>(0, {{"InputLayer", { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f }}}, @@ -168,4 +167,4 @@ BOOST_FIXTURE_TEST_CASE(BatchNormalizationFloat32, BatchNormFixture) 1.4138602f, 2.12079024f, 2.8277204f }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp b/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp index 2105792993..fea695d3cd 100644 --- a/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp +++ b/src/armnnDeserializer/test/DeserializeBatchToSpaceNd.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_BatchToSpaceND") +{ struct BatchToSpaceNdFixture : public ParserFlatbuffersSerializeFixture { explicit BatchToSpaceNdFixture(const std::string &inputShape, @@ -116,7 +115,7 @@ struct SimpleBatchToSpaceNdFixture : BatchToSpaceNdFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleBatchToSpaceNdFloat32, SimpleBatchToSpaceNdFixture) +TEST_CASE_FIXTURE(SimpleBatchToSpaceNdFixture, "SimpleBatchToSpaceNdFloat32") { RunTest<4, armnn::DataType::Float32>(0, { @@ -133,4 +132,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleBatchToSpaceNdFloat32, SimpleBatchToSpaceNdFixture }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeCast.cpp b/src/armnnDeserializer/test/DeserializeCast.cpp index c8e3e10871..b56b6ce91f 100644 --- a/src/armnnDeserializer/test/DeserializeCast.cpp +++ b/src/armnnDeserializer/test/DeserializeCast.cpp @@ -9,13 +9,10 @@ #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <boost/test/unit_test.hpp> - #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - - +TEST_SUITE("Deserializer_Cast") +{ struct CastFixture : public ParserFlatbuffersSerializeFixture { explicit CastFixture(const std::string& inputShape, @@ -112,12 +109,12 @@ struct SimpleCastFixture : CastFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleCast, SimpleCastFixture) +TEST_CASE_FIXTURE(SimpleCastFixture, "SimpleCast") { -RunTest<2, armnn::DataType::Signed32 , armnn::DataType::Float32>( -0, -{{"inputTensor", { 0, -1, 5, -100, 200, -255 }}}, -{{"outputTensor", { 0.0f, -1.0f, 5.0f, -100.0f, 200.0f, -255.0f }}}); + RunTest<2, armnn::DataType::Signed32 , armnn::DataType::Float32>( + 0, + {{"inputTensor", { 0, -1, 5, -100, 200, -255 }}}, + {{"outputTensor", { 0.0f, -1.0f, 5.0f, -100.0f, 200.0f, -255.0f }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeComparison.cpp b/src/armnnDeserializer/test/DeserializeComparison.cpp index c995c928d0..a941f123d6 100644 --- a/src/armnnDeserializer/test/DeserializeComparison.cpp +++ b/src/armnnDeserializer/test/DeserializeComparison.cpp @@ -9,12 +9,10 @@ #include <QuantizeHelper.hpp> #include <ResolveType.hpp> -#include <boost/test/unit_test.hpp> - #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Comparison") +{ #define DECLARE_SIMPLE_COMPARISON_FIXTURE(operation, dataType) \ struct Simple##operation##dataType##Fixture : public SimpleComparisonFixture \ { \ @@ -24,7 +22,7 @@ struct Simple##operation##dataType##Fixture : public SimpleComparisonFixture \ #define DECLARE_SIMPLE_COMPARISON_TEST_CASE(operation, dataType) \ DECLARE_SIMPLE_COMPARISON_FIXTURE(operation, dataType) \ -BOOST_FIXTURE_TEST_CASE(operation##dataType, Simple##operation##dataType##Fixture) \ +TEST_CASE_FIXTURE(Simple##operation##dataType##Fixture, #operation#dataType) \ { \ using T = armnn::ResolveType<armnn::DataType::dataType>; \ constexpr float qScale = 1.f; \ @@ -259,4 +257,4 @@ DECLARE_SIMPLE_COMPARISON_TEST_CASE(Less, QAsymmU8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(LessOrEqual, QAsymmU8) DECLARE_SIMPLE_COMPARISON_TEST_CASE(NotEqual, QAsymmU8) -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeConstant.cpp b/src/armnnDeserializer/test/DeserializeConstant.cpp index 7aceb7b48c..682e8a157d 100644 --- a/src/armnnDeserializer/test/DeserializeConstant.cpp +++ b/src/armnnDeserializer/test/DeserializeConstant.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(DeserializeParser) - +TEST_SUITE("DeserializeParser_Constant") +{ struct ConstantAddFixture : public ParserFlatbuffersSerializeFixture { explicit ConstantAddFixture(const std::string & shape, @@ -140,7 +139,7 @@ struct SimpleConstantAddFixture : ConstantAddFixture {} }; -BOOST_FIXTURE_TEST_CASE(SimpleConstantAddQuantisedAsymm8, SimpleConstantAddFixture) +TEST_CASE_FIXTURE(SimpleConstantAddFixture, "SimpleConstantAddQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -148,4 +147,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleConstantAddQuantisedAsymm8, SimpleConstantAddFixtu { 2, 4, 6, 8, 10, 12 }); } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeConvolution2d.cpp b/src/armnnDeserializer/test/DeserializeConvolution2d.cpp index b09c095196..6461250570 100644 --- a/src/armnnDeserializer/test/DeserializeConvolution2d.cpp +++ b/src/armnnDeserializer/test/DeserializeConvolution2d.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Convolution2D") +{ struct Convolution2dFixture : public ParserFlatbuffersSerializeFixture { explicit Convolution2dFixture(const std::string & inputShape1, @@ -130,7 +129,7 @@ struct SimpleConvolution2dFixture : Convolution2dFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(Convolution2dFloat32, SimpleConvolution2dFixture) +TEST_CASE_FIXTURE(SimpleConvolution2dFixture, "Convolution2dFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -138,4 +137,4 @@ BOOST_FIXTURE_TEST_CASE(Convolution2dFloat32, SimpleConvolution2dFixture) {{"OutputLayer", {23, 33, 24, 91, 99, 48, 26, 50, 19}}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp b/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp index 55de807a7a..e446a2dab4 100644 --- a/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp +++ b/src/armnnDeserializer/test/DeserializeDepthToSpace.cpp @@ -7,12 +7,10 @@ #include <armnnDeserializer/IDeserializer.hpp> -#include <boost/test/unit_test.hpp> - #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_DepthToSpace") +{ struct DepthToSpaceFixture : public ParserFlatbuffersSerializeFixture { explicit DepthToSpaceFixture(const std::string& inputShape, @@ -115,7 +113,7 @@ struct DepthToSpaceFloat32Fixture : DepthToSpaceFixture "Float32") {} // data type }; -BOOST_FIXTURE_TEST_CASE(DepthToSpaceFloat32, DepthToSpaceFloat32Fixture) +TEST_CASE_FIXTURE(DepthToSpaceFloat32Fixture, "DepthToSpaceFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -133,4 +131,4 @@ BOOST_FIXTURE_TEST_CASE(DepthToSpaceFloat32, DepthToSpaceFloat32Fixture) }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeDivision.cpp b/src/armnnDeserializer/test/DeserializeDivision.cpp index a77cb92f7c..41e65d418d 100644 --- a/src/armnnDeserializer/test/DeserializeDivision.cpp +++ b/src/armnnDeserializer/test/DeserializeDivision.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Division") +{ struct DivisionFixture : public ParserFlatbuffersSerializeFixture { explicit DivisionFixture(const std::string & inputShape1, @@ -138,7 +137,7 @@ struct SimpleDivisionFixture2 : DivisionFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(DivisionQuantisedAsymm8, SimpleDivisionFixture) +TEST_CASE_FIXTURE(SimpleDivisionFixture, "DivisionQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -147,7 +146,7 @@ BOOST_FIXTURE_TEST_CASE(DivisionQuantisedAsymm8, SimpleDivisionFixture) {{"OutputLayer", { 0, 5, 3, 3 }}}); } -BOOST_FIXTURE_TEST_CASE(DivisionFloat32, SimpleDivisionFixture2) +TEST_CASE_FIXTURE(SimpleDivisionFixture2, "DivisionFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -156,4 +155,4 @@ BOOST_FIXTURE_TEST_CASE(DivisionFloat32, SimpleDivisionFixture2) {{"OutputLayer", { 20, 5, 226, 3 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeFill.cpp b/src/armnnDeserializer/test/DeserializeFill.cpp index 70434798da..2a961b42cc 100644 --- a/src/armnnDeserializer/test/DeserializeFill.cpp +++ b/src/armnnDeserializer/test/DeserializeFill.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Fill") +{ struct FillFixture : public ParserFlatbuffersSerializeFixture { explicit FillFixture() @@ -123,7 +122,7 @@ struct SimpleFillFixture : FillFixture SimpleFillFixture() : FillFixture() {} }; -BOOST_FIXTURE_TEST_CASE(Fill, SimpleFillFixture) +TEST_CASE_FIXTURE(SimpleFillFixture, "Fill") { RunTest<4, armnn::DataType::Signed32, armnn::DataType::Float32>( 0, @@ -131,4 +130,4 @@ BOOST_FIXTURE_TEST_CASE(Fill, SimpleFillFixture) {{"OutputLayer",{ 1, 1, 1, 1, 1, 1, 1, 1, 1}}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeFloor.cpp b/src/armnnDeserializer/test/DeserializeFloor.cpp index 8ce235eb37..b4b584d70a 100644 --- a/src/armnnDeserializer/test/DeserializeFloor.cpp +++ b/src/armnnDeserializer/test/DeserializeFloor.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Floor") +{ struct FloorFixture : public ParserFlatbuffersSerializeFixture { explicit FloorFixture(const std::string& shape, @@ -97,7 +96,7 @@ struct SimpleFloorFixture : FloorFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(Floor, SimpleFloorFixture) +TEST_CASE_FIXTURE(SimpleFloorFixture, "Floor") { RunTest<4, armnn::DataType::Float32>( 4, @@ -106,4 +105,4 @@ BOOST_FIXTURE_TEST_CASE(Floor, SimpleFloorFixture) } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp index 66269dc4c3..da2db08fd4 100644 --- a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp +++ b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(DeserializeParser) - +TEST_SUITE("DeserializeParser_FullyConnected") +{ struct FullyConnectedFixture : public ParserFlatbuffersSerializeFixture { explicit FullyConnectedFixture(const std::string & inputShape1, @@ -128,7 +127,7 @@ struct FullyConnectedWithNoBiasFixture : FullyConnectedFixture {} }; -BOOST_FIXTURE_TEST_CASE(FullyConnectedWithNoBias, FullyConnectedWithNoBiasFixture) +TEST_CASE_FIXTURE(FullyConnectedWithNoBiasFixture, "FullyConnectedWithNoBias") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -136,4 +135,4 @@ BOOST_FIXTURE_TEST_CASE(FullyConnectedWithNoBias, FullyConnectedWithNoBiasFixtur {{"OutputLayer", { 400/2 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeGather.cpp b/src/armnnDeserializer/test/DeserializeGather.cpp index 0590e701e4..47919c4481 100644 --- a/src/armnnDeserializer/test/DeserializeGather.cpp +++ b/src/armnnDeserializer/test/DeserializeGather.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Gather") +{ struct GatherFixture : public ParserFlatbuffersSerializeFixture { explicit GatherFixture(const std::string& inputShape, @@ -133,7 +132,7 @@ struct SimpleGatherFixtureFloat32 : GatherFixture "[ 2, 3, 2, 3 ]", "0", "Float32", "IntData") {} }; -BOOST_FIXTURE_TEST_CASE(GatherFloat32, SimpleGatherFixtureFloat32) +TEST_CASE_FIXTURE(SimpleGatherFixtureFloat32, "GatherFloat32") { RunTest<4, armnn::DataType::Float32>(0, {{"InputLayer", { 1, 2, 3, @@ -156,5 +155,5 @@ BOOST_FIXTURE_TEST_CASE(GatherFloat32, SimpleGatherFixtureFloat32) 4, 5, 6 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp b/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp index 5f634296a1..0d292461ca 100644 --- a/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeInstanceNormalization.cpp @@ -8,10 +8,8 @@ #include <string> -#include <boost/test/unit_test.hpp> - -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_InstanceNormalization") +{ struct InstanceNormalizationFixture : public ParserFlatbuffersSerializeFixture { explicit InstanceNormalizationFixture(const std::string &inputShape, @@ -120,7 +118,7 @@ struct InstanceNormalizationFloat32Fixture : InstanceNormalizationFixture "NHWC") {} }; -BOOST_FIXTURE_TEST_CASE(InstanceNormalizationFloat32, InstanceNormalizationFloat32Fixture) +TEST_CASE_FIXTURE(InstanceNormalizationFloat32Fixture, "InstanceNormalizationFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -152,4 +150,4 @@ BOOST_FIXTURE_TEST_CASE(InstanceNormalizationFloat32, InstanceNormalizationFloat }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeL2Normalization.cpp b/src/armnnDeserializer/test/DeserializeL2Normalization.cpp index c32343f08e..d9a512eafc 100644 --- a/src/armnnDeserializer/test/DeserializeL2Normalization.cpp +++ b/src/armnnDeserializer/test/DeserializeL2Normalization.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_L2Normalization") +{ struct L2NormalizationFixture : public ParserFlatbuffersSerializeFixture { explicit L2NormalizationFixture(const std::string &inputShape, @@ -114,7 +113,7 @@ struct L2NormFixture : L2NormalizationFixture "0.00000001"){} }; -BOOST_FIXTURE_TEST_CASE(L2NormalizationFloat32, L2NormFixture) +TEST_CASE_FIXTURE(L2NormFixture, "L2NormalizationFloat32") { // 1 / sqrt(1^2 + 2^2 + 3^2) const float approxInvL2Norm = 0.267261f; @@ -126,7 +125,7 @@ BOOST_FIXTURE_TEST_CASE(L2NormalizationFloat32, L2NormFixture) 3.0f * approxInvL2Norm }}}); } -BOOST_FIXTURE_TEST_CASE(L2NormalizationEpsilonLimitFloat32, L2NormFixture) +TEST_CASE_FIXTURE(L2NormFixture, "L2NormalizationEpsilonLimitFloat32") { // 1 / sqrt(1e-8) const float approxInvL2Norm = 10000; @@ -138,4 +137,4 @@ BOOST_FIXTURE_TEST_CASE(L2NormalizationEpsilonLimitFloat32, L2NormFixture) 0.00000003f * approxInvL2Norm }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp b/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp index 201b64b620..d437ac8c7f 100644 --- a/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp +++ b/src/armnnDeserializer/test/DeserializeLogSoftmax.cpp @@ -6,10 +6,8 @@ #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> -#include <boost/test/unit_test.hpp> - -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_LogSoftmax") +{ struct LogSoftmaxFixture : public ParserFlatbuffersSerializeFixture { explicit LogSoftmaxFixture(const std::string &shape, @@ -111,7 +109,7 @@ struct LogSoftmaxFloat32Fixture : LogSoftmaxFixture {} }; -BOOST_FIXTURE_TEST_CASE(LogSoftmaxFloat32, LogSoftmaxFloat32Fixture) +TEST_CASE_FIXTURE(LogSoftmaxFloat32Fixture, "LogSoftmaxFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -125,4 +123,4 @@ BOOST_FIXTURE_TEST_CASE(LogSoftmaxFloat32, LogSoftmaxFloat32Fixture) }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeMean.cpp b/src/armnnDeserializer/test/DeserializeMean.cpp index e8eebdf7f9..6c82183741 100644 --- a/src/armnnDeserializer/test/DeserializeMean.cpp +++ b/src/armnnDeserializer/test/DeserializeMean.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Mean") +{ struct MeanFixture : public ParserFlatbuffersSerializeFixture { explicit MeanFixture(const std::string &inputShape, @@ -113,7 +112,7 @@ struct SimpleMeanFixture : MeanFixture {} }; -BOOST_FIXTURE_TEST_CASE(SimpleMean, SimpleMeanFixture) +TEST_CASE_FIXTURE(SimpleMeanFixture, "SimpleMean") { RunTest<4, armnn::DataType::Float32>( 0, @@ -121,4 +120,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleMean, SimpleMeanFixture) {{"OutputLayer", { 2.0f, 2.0f }}}); } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeMultiplication.cpp b/src/armnnDeserializer/test/DeserializeMultiplication.cpp index 313c78cf05..0956fc531a 100644 --- a/src/armnnDeserializer/test/DeserializeMultiplication.cpp +++ b/src/armnnDeserializer/test/DeserializeMultiplication.cpp @@ -8,12 +8,10 @@ #include <armnn/utility/IgnoreUnused.hpp> -#include <boost/test/unit_test.hpp> - #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Multiplication") +{ struct MultiplicationFixture : public ParserFlatbuffersSerializeFixture { explicit MultiplicationFixture(const std::string & inputShape1, @@ -143,7 +141,7 @@ struct SimpleMultiplicationFixture2 : MultiplicationFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(MultiplicationQuantisedAsymm8, SimpleMultiplicationFixture) +TEST_CASE_FIXTURE(SimpleMultiplicationFixture, "MultiplicationQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -152,7 +150,7 @@ BOOST_FIXTURE_TEST_CASE(MultiplicationQuantisedAsymm8, SimpleMultiplicationFixtu {{"OutputLayer", { 0, 5, 12, 21 }}}); } -BOOST_FIXTURE_TEST_CASE(MultiplicationFloat32, SimpleMultiplicationFixture2) +TEST_CASE_FIXTURE(SimpleMultiplicationFixture2, "MultiplicationFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -161,4 +159,4 @@ BOOST_FIXTURE_TEST_CASE(MultiplicationFloat32, SimpleMultiplicationFixture2) {{"OutputLayer", { 500, 320, 226, 108 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeNormalization.cpp b/src/armnnDeserializer/test/DeserializeNormalization.cpp index de68167612..a398bfac28 100644 --- a/src/armnnDeserializer/test/DeserializeNormalization.cpp +++ b/src/armnnDeserializer/test/DeserializeNormalization.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Normalization") +{ struct NormalizationFixture : public ParserFlatbuffersSerializeFixture { explicit NormalizationFixture(const std::string &inputShape, @@ -116,7 +115,7 @@ struct FloatNhwcLocalBrightnessAcrossNormalizationFixture : NormalizationFixture }; -BOOST_FIXTURE_TEST_CASE(Float32NormalizationNhwcDataLayout, FloatNhwcLocalBrightnessAcrossNormalizationFixture) +TEST_CASE_FIXTURE(FloatNhwcLocalBrightnessAcrossNormalizationFixture, "Float32NormalizationNhwcDataLayout") { RunTest<4, armnn::DataType::Float32>(0, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }, @@ -130,7 +129,7 @@ struct FloatNchwLocalBrightnessWithinNormalizationFixture : NormalizationFixture "Float32", "1", "0", "NCHW") {} }; -BOOST_FIXTURE_TEST_CASE(Float32NormalizationNchwDataLayout, FloatNchwLocalBrightnessWithinNormalizationFixture) +TEST_CASE_FIXTURE(FloatNchwLocalBrightnessWithinNormalizationFixture, "Float32NormalizationNchwDataLayout") { RunTest<4, armnn::DataType::Float32>(0, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f }, @@ -138,5 +137,4 @@ BOOST_FIXTURE_TEST_CASE(Float32NormalizationNchwDataLayout, FloatNchwLocalBright 0.0285714f, 0.0342857f, 0.04f, 0.0457143f }); } - -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializePad.cpp b/src/armnnDeserializer/test/DeserializePad.cpp index c2d21e5431..43de22912f 100644 --- a/src/armnnDeserializer/test/DeserializePad.cpp +++ b/src/armnnDeserializer/test/DeserializePad.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Pad") +{ struct PadFixture : public ParserFlatbuffersSerializeFixture { explicit PadFixture(const std::string &inputShape, @@ -110,7 +109,7 @@ struct SimplePadFixture : PadFixture "QuantisedAsymm8") {} }; -BOOST_FIXTURE_TEST_CASE(SimplePadQuantisedAsymm8, SimplePadFixture) +TEST_CASE_FIXTURE(SimplePadFixture, "SimplePadQuantisedAsymm8") { RunTest<3, armnn::DataType::QAsymmU8>(0, { @@ -126,4 +125,4 @@ BOOST_FIXTURE_TEST_CASE(SimplePadQuantisedAsymm8, SimplePadFixture) }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializePermute.cpp b/src/armnnDeserializer/test/DeserializePermute.cpp index 8cfe25baca..7b474e215d 100644 --- a/src/armnnDeserializer/test/DeserializePermute.cpp +++ b/src/armnnDeserializer/test/DeserializePermute.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Permute") +{ struct PermuteFixture : public ParserFlatbuffersSerializeFixture { explicit PermuteFixture(const std::string &inputShape, @@ -110,7 +109,7 @@ struct SimplePermute2DFixture : PermuteFixture "QuantisedAsymm8") {} }; -BOOST_FIXTURE_TEST_CASE(SimplePermute2DQuantisedAsymm8, SimplePermute2DFixture) +TEST_CASE_FIXTURE(SimplePermute2DFixture, "SimplePermute2DQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6 }, @@ -125,7 +124,7 @@ struct SimplePermute4DFixture : PermuteFixture "QuantisedAsymm8") {} }; -BOOST_FIXTURE_TEST_CASE(SimplePermute4DQuantisedAsymm8, SimplePermute4DFixture) +TEST_CASE_FIXTURE(SimplePermute4DFixture, "SimplePermute4DQuantisedAsymm8") { RunTest<4, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, @@ -134,4 +133,4 @@ BOOST_FIXTURE_TEST_CASE(SimplePermute4DQuantisedAsymm8, SimplePermute4DFixture) 3, 15, 7, 19, 11, 23, 4, 16, 8, 20, 12, 24 }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializePooling2d.cpp b/src/armnnDeserializer/test/DeserializePooling2d.cpp index bf7b8ae8d4..1c6fe9c8db 100644 --- a/src/armnnDeserializer/test/DeserializePooling2d.cpp +++ b/src/armnnDeserializer/test/DeserializePooling2d.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Pooling2d") +{ struct Pooling2dFixture : public ParserFlatbuffersSerializeFixture { explicit Pooling2dFixture(const std::string &inputShape, @@ -141,30 +140,30 @@ struct SimpleL2Pooling2dFixture : Pooling2dFixture "Float32", "NHWC", "L2") {} }; -BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Avg, SimpleAvgPooling2dFixture) +TEST_CASE_FIXTURE(SimpleAvgPooling2dFixture, "Pooling2dFloat32Avg") { RunTest<4, armnn::DataType::Float32>(0, { 2, 3, 5, 2 }, { 3 }); } -BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Avg, SimpleAvgPooling2dFixture2) +TEST_CASE_FIXTURE(SimpleAvgPooling2dFixture2, "Pooling2dQuantisedAsymm8Avg") { RunTest<4, armnn::DataType::QAsymmU8>(0,{ 20, 40, 60, 80 },{ 50 }); } -BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32Max, SimpleMaxPooling2dFixture) +TEST_CASE_FIXTURE(SimpleMaxPooling2dFixture, "Pooling2dFloat32Max") { RunTest<4, armnn::DataType::Float32>(0, { 2, 5, 5, 2 }, { 5 }); } -BOOST_FIXTURE_TEST_CASE(Pooling2dQuantisedAsymm8Max, SimpleMaxPooling2dFixture2) +TEST_CASE_FIXTURE(SimpleMaxPooling2dFixture2, "Pooling2dQuantisedAsymm8Max") { RunTest<4, armnn::DataType::QAsymmU8>(0,{ 20, 40, 60, 80 },{ 80 }); } -BOOST_FIXTURE_TEST_CASE(Pooling2dFloat32L2, SimpleL2Pooling2dFixture) +TEST_CASE_FIXTURE(SimpleL2Pooling2dFixture, "Pooling2dFloat32L2") { RunTest<4, armnn::DataType::Float32>(0, { 2, 3, 5, 2 }, { 3.2403703f }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeRank.cpp b/src/armnnDeserializer/test/DeserializeRank.cpp index 920283fa40..3cb3459fd2 100644 --- a/src/armnnDeserializer/test/DeserializeRank.cpp +++ b/src/armnnDeserializer/test/DeserializeRank.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Rank") +{ struct RankFixture : public ParserFlatbuffersSerializeFixture { explicit RankFixture(const std::string &inputShape, @@ -120,32 +119,32 @@ struct SimpleRankDimSize4Fixture : RankFixture SimpleRankDimSize4Fixture() : RankFixture("[ 2, 2, 1, 1 ]", "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(RankDimSize1Float16, SimpleRankDimSize1Fixture) +TEST_CASE_FIXTURE(SimpleRankDimSize1Fixture, "RankDimSize1Float16") { RunTest<1, armnn::DataType::QSymmS16, armnn::DataType::Signed32>( 0, { 1, 2, 3, 4, 5, 6, 7, 8 }, { 1 }); } -BOOST_FIXTURE_TEST_CASE(RankDimSize2QAsymmU8, SimpleRankDimSize2Fixture) +TEST_CASE_FIXTURE(SimpleRankDimSize2Fixture, "RankDimSize2QAsymmU8") { RunTest<1, armnn::DataType::QSymmS8, armnn::DataType::Signed32>( 0, { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, { 2 }); } -BOOST_FIXTURE_TEST_CASE(RankDimSize3Signed32, SimpleRankDimSize3Fixture) +TEST_CASE_FIXTURE(SimpleRankDimSize3Fixture, "RankDimSize3Signed32") { RunTest<1, armnn::DataType::Signed32, armnn::DataType::Signed32>( 0, { 111, 85, 226, 3 }, { 3 }); } -BOOST_FIXTURE_TEST_CASE(RankDimSize4Float32, SimpleRankDimSize4Fixture) +TEST_CASE_FIXTURE(SimpleRankDimSize4Fixture, "RankDimSize4Float32") { RunTest<1, armnn::DataType::Float32, armnn::DataType::Signed32>( 0, { 111, 85, 226, 3 }, { 4 }); } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeReduceSum.cpp b/src/armnnDeserializer/test/DeserializeReduceSum.cpp index 326560ff22..1d72b0f33f 100644 --- a/src/armnnDeserializer/test/DeserializeReduceSum.cpp +++ b/src/armnnDeserializer/test/DeserializeReduceSum.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include "../Deserializer.hpp" #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_ReduceSum") +{ struct ReduceSumFixture : public ParserFlatbuffersSerializeFixture { explicit ReduceSumFixture(const std::string& inputShape, @@ -114,7 +113,7 @@ struct SimpleReduceSumFixture : ReduceSumFixture {} }; -BOOST_FIXTURE_TEST_CASE(SimpleReduceSum, SimpleReduceSumFixture) +TEST_CASE_FIXTURE(SimpleReduceSumFixture, "SimpleReduceSum") { RunTest<4, armnn::DataType::Float32>( 0, @@ -122,4 +121,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleReduceSum, SimpleReduceSumFixture) {{"OutputLayer", { 6.0f, 6.0f }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeReshape.cpp b/src/armnnDeserializer/test/DeserializeReshape.cpp index c771a232b0..5a1984af9a 100644 --- a/src/armnnDeserializer/test/DeserializeReshape.cpp +++ b/src/armnnDeserializer/test/DeserializeReshape.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Reshape") +{ struct ReshapeFixture : public ParserFlatbuffersSerializeFixture { explicit ReshapeFixture(const std::string &inputShape, @@ -109,14 +108,14 @@ struct SimpleReshapeFixture2 : ReshapeFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(ReshapeQuantisedAsymm8, SimpleReshapeFixture) +TEST_CASE_FIXTURE(SimpleReshapeFixture, "ReshapeQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6, 7, 8, 9 }, { 1, 2, 3, 4, 5, 6, 7, 8, 9 }); } -BOOST_FIXTURE_TEST_CASE(ReshapeFloat32, SimpleReshapeFixture2) +TEST_CASE_FIXTURE(SimpleReshapeFixture2, "ReshapeFloat32") { RunTest<4, armnn::DataType::Float32>(0, { 111, 85, 226, 3 }, @@ -124,4 +123,4 @@ BOOST_FIXTURE_TEST_CASE(ReshapeFloat32, SimpleReshapeFixture2) } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp b/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp index a9e5522595..da2be7b238 100644 --- a/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp +++ b/src/armnnDeserializer/test/DeserializeResizeBilinear.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_ResizeBilinear") +{ struct ResizeBilinearFixture : public ParserFlatbuffersSerializeFixture { explicit ResizeBilinearFixture(const std::string& inputShape, @@ -116,7 +115,7 @@ struct SimpleResizeBilinearFixture : ResizeBilinearFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleResizeBilinearFloat32, SimpleResizeBilinearFixture) +TEST_CASE_FIXTURE(SimpleResizeBilinearFixture, "SimpleResizeBilinearFloat32") { RunTest<4, armnn::DataType::Float32>(0, { @@ -128,4 +127,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleResizeBilinearFloat32, SimpleResizeBilinearFixture }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeRsqrt.cpp b/src/armnnDeserializer/test/DeserializeRsqrt.cpp index 68de783fb2..2264f7f54a 100644 --- a/src/armnnDeserializer/test/DeserializeRsqrt.cpp +++ b/src/armnnDeserializer/test/DeserializeRsqrt.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Rsqrt") +{ struct RsqrtFixture : public ParserFlatbuffersSerializeFixture { explicit RsqrtFixture(const std::string & inputShape, @@ -102,7 +101,7 @@ struct Rsqrt2dFixture : RsqrtFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(Rsqrt2d, Rsqrt2dFixture) +TEST_CASE_FIXTURE(Rsqrt2dFixture, "Rsqrt2d") { RunTest<2, armnn::DataType::Float32>( 0, @@ -113,4 +112,4 @@ BOOST_FIXTURE_TEST_CASE(Rsqrt2d, Rsqrt2dFixture) } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeSlice.cpp b/src/armnnDeserializer/test/DeserializeSlice.cpp index bc5cea67aa..e0bfb217fc 100644 --- a/src/armnnDeserializer/test/DeserializeSlice.cpp +++ b/src/armnnDeserializer/test/DeserializeSlice.cpp @@ -7,12 +7,10 @@ #include <armnnDeserializer/IDeserializer.hpp> -#include <boost/test/unit_test.hpp> - #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Slice") +{ struct SliceFixture : public ParserFlatbuffersSerializeFixture { explicit SliceFixture(const std::string& inputShape, @@ -115,7 +113,7 @@ struct SimpleSliceFixture : SliceFixture "Float32") {} // data type }; -BOOST_FIXTURE_TEST_CASE(SimpleSliceFloat32, SimpleSliceFixture) +TEST_CASE_FIXTURE(SimpleSliceFixture, "SimpleSliceFloat32") { RunTest<4, armnn::DataType::Float32>( 0, @@ -155,4 +153,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleSliceFloat32, SimpleSliceFixture) }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp b/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp index 6ee2a3f0d4..0c8675b450 100644 --- a/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp +++ b/src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_SpaceToBatchND") +{ struct SpaceToBatchNdFixture : public ParserFlatbuffersSerializeFixture { explicit SpaceToBatchNdFixture(const std::string &inputShape, @@ -116,7 +115,7 @@ struct SimpleSpaceToBatchNdFixture : SpaceToBatchNdFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleSpaceToBatchNdFloat32, SimpleSpaceToBatchNdFixture) +TEST_CASE_FIXTURE(SimpleSpaceToBatchNdFixture, "SimpleBatchToSpaceNdFloat32") { RunTest<4, armnn::DataType::Float32>(0, { @@ -137,4 +136,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleSpaceToBatchNdFloat32, SimpleSpaceToBatchNdFixture }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeStridedSlice.cpp b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp index 66342223ac..e3ef71e847 100644 --- a/src/armnnDeserializer/test/DeserializeStridedSlice.cpp +++ b/src/armnnDeserializer/test/DeserializeStridedSlice.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_StridedSlice") +{ struct StridedSliceFixture : public ParserFlatbuffersSerializeFixture { explicit StridedSliceFixture(const std::string& inputShape, @@ -134,7 +133,7 @@ struct SimpleStridedSliceFixture : StridedSliceFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleStridedSliceFloat32, SimpleStridedSliceFixture) +TEST_CASE_FIXTURE(SimpleStridedSliceFixture, "SimpleStridedSliceFloat32") { RunTest<4, armnn::DataType::Float32>(0, { @@ -163,7 +162,7 @@ struct StridedSliceMaskFixture : StridedSliceFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(StridedSliceMaskFloat32, StridedSliceMaskFixture) +TEST_CASE_FIXTURE(StridedSliceMaskFixture, "StridedSliceMaskFloat32") { RunTest<4, armnn::DataType::Float32>(0, { @@ -178,4 +177,4 @@ BOOST_FIXTURE_TEST_CASE(StridedSliceMaskFloat32, StridedSliceMaskFixture) }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeSubtraction.cpp b/src/armnnDeserializer/test/DeserializeSubtraction.cpp index 789653c4bc..63e7c913c9 100644 --- a/src/armnnDeserializer/test/DeserializeSubtraction.cpp +++ b/src/armnnDeserializer/test/DeserializeSubtraction.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Subtraction") +{ struct SubtractionFixture : public ParserFlatbuffersSerializeFixture { explicit SubtractionFixture(const std::string & inputShape1, @@ -145,7 +144,7 @@ struct SimpleSubtractionFixtureBroadcast : SubtractionFixture "Float32") {} }; -BOOST_FIXTURE_TEST_CASE(SubtractionQuantisedAsymm8, SimpleSubtractionFixture) +TEST_CASE_FIXTURE(SimpleSubtractionFixture, "SubtractionQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>( 0, @@ -154,7 +153,7 @@ BOOST_FIXTURE_TEST_CASE(SubtractionQuantisedAsymm8, SimpleSubtractionFixture) {{"outputLayer", { 1, 3, 5, 7 }}}); } -BOOST_FIXTURE_TEST_CASE(SubtractionFloat32, SimpleSubtractionFixture2) +TEST_CASE_FIXTURE(SimpleSubtractionFixture2, "SubtractionFloat32") { RunTest<2, armnn::DataType::Float32>( 0, @@ -163,7 +162,7 @@ BOOST_FIXTURE_TEST_CASE(SubtractionFloat32, SimpleSubtractionFixture2) {{"outputLayer", { 1, 3, 5, 7 }}}); } -BOOST_FIXTURE_TEST_CASE(SubtractionBroadcast, SimpleSubtractionFixtureBroadcast) +TEST_CASE_FIXTURE(SimpleSubtractionFixtureBroadcast, "SubtractionBroadcast") { RunTest<2, armnn::DataType::Float32>( 0, @@ -172,4 +171,4 @@ BOOST_FIXTURE_TEST_CASE(SubtractionBroadcast, SimpleSubtractionFixtureBroadcast) {{"outputLayer", { 2, 3, 4, 5 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/DeserializeTranspose.cpp b/src/armnnDeserializer/test/DeserializeTranspose.cpp index 3e5ad56f5a..fe656d15bc 100644 --- a/src/armnnDeserializer/test/DeserializeTranspose.cpp +++ b/src/armnnDeserializer/test/DeserializeTranspose.cpp @@ -3,14 +3,13 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "ParserFlatbuffersSerializeFixture.hpp" #include <armnnDeserializer/IDeserializer.hpp> #include <string> -BOOST_AUTO_TEST_SUITE(Deserializer) - +TEST_SUITE("Deserializer_Transpose") +{ struct TransposeFixture : public ParserFlatbuffersSerializeFixture { explicit TransposeFixture(const std::string &inputShape, @@ -110,7 +109,7 @@ struct SimpleTranspose2DFixture : TransposeFixture "QuantisedAsymm8") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleTranspose2DQuantisedAsymm8, SimpleTranspose2DFixture) +TEST_CASE_FIXTURE(SimpleTranspose2DFixture, "SimpleTranspose2DQuantisedAsymm8") { RunTest<2, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6 }, @@ -125,7 +124,7 @@ struct SimpleTranspose4DFixture : TransposeFixture "QuantisedAsymm8") {} }; -BOOST_FIXTURE_TEST_CASE(SimpleTranspose4DQuantisedAsymm8, SimpleTranspose4DFixture) +TEST_CASE_FIXTURE(SimpleTranspose4DFixture, "SimpleTranspose4DQuantisedAsymm8") { RunTest<4, armnn::DataType::QAsymmU8>(0, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, @@ -134,4 +133,4 @@ BOOST_FIXTURE_TEST_CASE(SimpleTranspose4DQuantisedAsymm8, SimpleTranspose4DFixtu 3, 15, 7, 19, 11, 23, 4, 16, 8, 20, 12, 24 }); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp index a62cb96eb6..ac8d4b3ba6 100644 --- a/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp +++ b/src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp @@ -19,6 +19,7 @@ #include <ResolveType.hpp> #include <fmt/format.h> +#include <doctest/doctest.h> #include <vector> @@ -154,12 +155,12 @@ struct ParserFlatbuffersSerializeFixture const float scale, const int64_t zeroPoint) { armnn::IgnoreUnused(name); - BOOST_CHECK_EQUAL(shapeSize, tensors->dimensions()->size()); - BOOST_CHECK_EQUAL_COLLECTIONS(shape.begin(), shape.end(), - tensors->dimensions()->begin(), tensors->dimensions()->end()); - BOOST_CHECK_EQUAL(tensorType.dataType(), tensors->dataType()); - BOOST_CHECK_EQUAL(scale, tensors->quantizationScale()); - BOOST_CHECK_EQUAL(zeroPoint, tensors->quantizationOffset()); + CHECK_EQ(shapeSize, tensors->dimensions()->size()); + CHECK(std::equal(shape.begin(), shape.end(), + tensors->dimensions()->begin(), tensors->dimensions()->end())); + CHECK_EQ(tensorType.dataType(), tensors->dataType()); + CHECK_EQ(scale, tensors->quantizationScale()); + CHECK_EQ(zeroPoint, tensors->quantizationOffset()); } }; @@ -241,6 +242,6 @@ void ParserFlatbuffersSerializeFixture::RunTest( auto outputExpected = it.second; auto result = CompareTensors(outputExpected, outputStorage[it.first], bindingInfo.second.GetShape(), bindingInfo.second.GetShape()); - BOOST_TEST(result.m_Result, result.m_Message.str()); + CHECK_MESSAGE(result.m_Result, result.m_Message.str()); } } |