diff options
Diffstat (limited to 'src/armnnOnnxParser/test')
-rw-r--r-- | src/armnnOnnxParser/test/Addition.cpp | 25 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/BatchNorm.cpp | 11 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Clip.cpp | 15 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Const.cpp | 13 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Constructor.cpp | 9 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Conv2D.cpp | 15 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/CreateNetwork.cpp | 21 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/DepthConv.cpp | 9 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Flatten.cpp | 23 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/FullyConnected.cpp | 15 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/GetInputsOutputs.cpp | 43 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Pooling.cpp | 19 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/ProtoxtFixture.cpp | 13 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Relu.cpp | 9 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Reshape.cpp | 15 |
15 files changed, 121 insertions, 134 deletions
diff --git a/src/armnnOnnxParser/test/Addition.cpp b/src/armnnOnnxParser/test/Addition.cpp index 6fc8eb1151..d18c277457 100644 --- a/src/armnnOnnxParser/test/Addition.cpp +++ b/src/armnnOnnxParser/test/Addition.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Addition") +{ struct AddMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { AddMainFixture(const std::string& dataType) @@ -383,37 +382,37 @@ struct AddInvalidScalarFixture : AddScalarFixture AddInvalidScalarFixture() : AddScalarFixture("6") { } }; -BOOST_FIXTURE_TEST_CASE(ValidAddTest, AddValidFixture) +TEST_CASE_FIXTURE(AddValidFixture, "ValidAddTest") { RunTest<4>({{"Input0", {1.0f, 2.0f, -3.0f, -4.0f}}, {"Input1", {1.0f, 2.0f, 3.0, 4.0f}}}, {{"Output", {2.0, 4.0, 0, 0.0}}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeAdd, AddInvalidFixture) +TEST_CASE_FIXTURE(AddInvalidFixture, "IncorrectDataTypeAdd") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_FIXTURE_TEST_CASE(InvalidBroadcastAdd, AddInvalidBroadcastFixture) +TEST_CASE_FIXTURE(AddInvalidBroadcastFixture, "InvalidBroadcastAdd") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_FIXTURE_TEST_CASE(ValidBroadcastAdd, AddValidBroadcastFixture) +TEST_CASE_FIXTURE(AddValidBroadcastFixture, "ValidBroadcastAdd") { RunTest<4>({{"Input0", {1.0f, 2.0f, -3.0f, -4.0f}}, {"Input1", {1.0f, 2.0f, 3.0, 4.0f}}}, {{"Output", {2.0, 4.0, 0, 0.0}}}); } -BOOST_FIXTURE_TEST_CASE(ValidAddScalarTest, AddValidScalarFixture) +TEST_CASE_FIXTURE(AddValidScalarFixture, "ValidAddScalarTest") { RunTest<4>({{"Input0", {1.0f, 2.0f, -3.0f, -4.0f}}, {"Input1", {-8.0f}}}, {{"Output", {-7.0, -6.0, -11.0, -12.0}}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeAddScalar, AddInvalidScalarFixture) +TEST_CASE_FIXTURE(AddInvalidScalarFixture, "IncorrectDataTypeAddScalar") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/armnnOnnxParser/test/BatchNorm.cpp b/src/armnnOnnxParser/test/BatchNorm.cpp index bbe961604c..f582dbd713 100644 --- a/src/armnnOnnxParser/test/BatchNorm.cpp +++ b/src/armnnOnnxParser/test/BatchNorm.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_BatchNorm") +{ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { BatchNormalizationMainFixture() @@ -164,7 +163,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< } }; -BOOST_FIXTURE_TEST_CASE(ValidBatchNormalizationTest, BatchNormalizationMainFixture) +TEST_CASE_FIXTURE(BatchNormalizationMainFixture, "ValidBatchNormalizationTest") { RunTest<4>({{"Input", {1, 2, 3, 4, 5, 6, 7, 8, 9}}}, // Input data. {{"Output", {-2.8277204f, -2.12079024f, -1.4138602f, @@ -332,11 +331,11 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a } }; -BOOST_FIXTURE_TEST_CASE(ValidBatchNormalizationBisTest, BatchNormalizationBisFixture) +TEST_CASE_FIXTURE(BatchNormalizationBisFixture, "ValidBatchNormalizationBisTest") { RunTest<4>({{"Input", {-1, 0.0, 1, 2, 3.0, 4.0}}}, // Input data. {{"Output", {-0.999995f, 0.0, 0.999995f, -0.22474074f, 1.0f, 2.2247407f}}}); // Expected output data. } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Clip.cpp b/src/armnnOnnxParser/test/Clip.cpp index 6420304291..b0447bcad5 100644 --- a/src/armnnOnnxParser/test/Clip.cpp +++ b/src/armnnOnnxParser/test/Clip.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Clip") +{ struct ClipMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { ClipMainFixture(std::string min, std::string max) @@ -68,7 +67,7 @@ struct ClipFixture : ClipMainFixture ClipFixture() : ClipMainFixture("2", "3.5") {} }; -BOOST_FIXTURE_TEST_CASE(ValidClipTest, ClipFixture) +TEST_CASE_FIXTURE(ClipFixture, "ValidClipTest") { RunTest<1>({{"Input", { -1.5f, 1.25f, 3.5f, 8.0, 2.5}}}, {{ "Output", { 2.0f, 2.0f, 3.5f, 3.5, 2.5}}}); @@ -79,7 +78,7 @@ struct ClipNoMaxInputFixture : ClipMainFixture ClipNoMaxInputFixture() : ClipMainFixture("0", std::string()) {} }; -BOOST_FIXTURE_TEST_CASE(ValidNoMaxInputClipTest, ClipNoMaxInputFixture) +TEST_CASE_FIXTURE(ClipNoMaxInputFixture, "ValidNoMaxInputClipTest") { RunTest<1>({{"Input", { -1.5f, -5.25f, -0.5f, 8.0f, std::numeric_limits<float>::max() }}}, {{ "Output", { 0.0f, 0.0f, 0.0f, 8.0f, std::numeric_limits<float>::max() }}}); @@ -90,7 +89,7 @@ struct ClipNoMinInputFixture : ClipMainFixture ClipNoMinInputFixture() : ClipMainFixture(std::string(), "6") {} }; -BOOST_FIXTURE_TEST_CASE(ValidNoMinInputClipTest, ClipNoMinInputFixture) +TEST_CASE_FIXTURE(ClipNoMinInputFixture, "ValidNoMinInputClipTest") { RunTest<1>({{"Input", { std::numeric_limits<float>::lowest(), -5.25f, -0.5f, 8.0f, 200.0f }}}, {{ "Output", { std::numeric_limits<float>::lowest(), -5.25f, -0.5f, 6.0f, 6.0f }}}); @@ -101,7 +100,7 @@ struct ClipNoInputFixture : ClipMainFixture ClipNoInputFixture() : ClipMainFixture(std::string(), std::string()) {} }; -BOOST_FIXTURE_TEST_CASE(ValidNoInputClipTest, ClipNoInputFixture) +TEST_CASE_FIXTURE(ClipNoInputFixture, "ValidNoInputClipTest") { RunTest<1>({{"Input", { std::numeric_limits<float>::lowest(), -1.25f, 3.5f, 8.0f, std::numeric_limits<float>::max()}}}, @@ -109,4 +108,4 @@ BOOST_FIXTURE_TEST_CASE(ValidNoInputClipTest, ClipNoInputFixture) std::numeric_limits<float>::max()}}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Const.cpp b/src/armnnOnnxParser/test/Const.cpp index 8777757a96..35df4e91e0 100644 --- a/src/armnnOnnxParser/test/Const.cpp +++ b/src/armnnOnnxParser/test/Const.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Const") +{ struct ConstMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { ConstMainFixture(const std::string& dataType) @@ -74,14 +73,14 @@ struct ConstInvalidFixture : ConstMainFixture ConstInvalidFixture() : ConstMainFixture("10") { } }; -BOOST_FIXTURE_TEST_CASE(ValidConstTest, ConstValidFixture) +TEST_CASE_FIXTURE(ConstValidFixture, "ValidConstTest") { RunTest<1>({ }, {{ "Output" , {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0}}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeConst, ConstInvalidFixture) +TEST_CASE_FIXTURE(ConstInvalidFixture, "IncorrectDataTypeConst") { - BOOST_CHECK_THROW( Setup(), armnn::ParseException); + CHECK_THROWS_AS( Setup(), armnn::ParseException); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Constructor.cpp b/src/armnnOnnxParser/test/Constructor.cpp index 76095e14eb..0fc3a1ecba 100644 --- a/src/armnnOnnxParser/test/Constructor.cpp +++ b/src/armnnOnnxParser/test/Constructor.cpp @@ -3,14 +3,15 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) +#include <doctest/doctest.h> -BOOST_AUTO_TEST_CASE(Create) +TEST_SUITE("OnnxParser_Constructor") +{ +TEST_CASE("Create") { armnnOnnxParser::IOnnxParserPtr parser(armnnOnnxParser::IOnnxParser::Create()); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Conv2D.cpp b/src/armnnOnnxParser/test/Conv2D.cpp index a38cc192ed..060388167f 100644 --- a/src/armnnOnnxParser/test/Conv2D.cpp +++ b/src/armnnOnnxParser/test/Conv2D.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Conv2D") +{ struct SimpleConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { SimpleConv2DFixture() @@ -578,7 +577,7 @@ struct Conv2DwithDilationFixture : public armnnUtils::ParserPrototxtFixture<armn } }; -BOOST_FIXTURE_TEST_CASE(ValidConvTest, SimpleConv2DFixture) +TEST_CASE_FIXTURE(SimpleConv2DFixture, "ValidConvTest") { RunTest<4>({{"Input", {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, @@ -588,7 +587,7 @@ BOOST_FIXTURE_TEST_CASE(ValidConvTest, SimpleConv2DFixture) 7.0 * 4 + 8.0 * 1 + 9.0 * 2}}}); } -BOOST_FIXTURE_TEST_CASE(ValidConvWithBiasTest, Conv2DWithBiasesFixture) +TEST_CASE_FIXTURE(Conv2DWithBiasesFixture, "ValidConvWithBiasTest") { RunTest<4>({{"Input", {1.0, 2.0, 3.0, 4.0}}}, @@ -598,7 +597,7 @@ BOOST_FIXTURE_TEST_CASE(ValidConvWithBiasTest, Conv2DWithBiasesFixture) 4.0 * 2 + 0 * 1 + 0 * 0 + 0 * 6 + 10}}}); } -BOOST_FIXTURE_TEST_CASE(ValidConvDimReducTest, Conv2DDimReducingFixture) +TEST_CASE_FIXTURE(Conv2DDimReducingFixture, "ValidConvDimReducTest") { RunTest<4>({{"Input", {1.0, 2.0, 3.0, 4.0, -1, -2, 3, 4, 1 , 1, 1, 1 }}}, {{"Output", {-1 * 1 + 2 * -1, -1 * 2 + 2 * -2, @@ -606,7 +605,7 @@ BOOST_FIXTURE_TEST_CASE(ValidConvDimReducTest, Conv2DDimReducingFixture) 1, 2, 3, 4}}}); } -BOOST_FIXTURE_TEST_CASE(ValidConvWithDilationTest, Conv2DwithDilationFixture) +TEST_CASE_FIXTURE(Conv2DwithDilationFixture, "ValidConvWithDilationTest") { RunTest<4>({{"Input", {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, @@ -617,4 +616,4 @@ BOOST_FIXTURE_TEST_CASE(ValidConvWithDilationTest, Conv2DwithDilationFixture) {{"Output", {39.0, 58.0, 153.0, 172.0 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/CreateNetwork.cpp b/src/armnnOnnxParser/test/CreateNetwork.cpp index 1e3e1b4fdd..eeeaca85dc 100644 --- a/src/armnnOnnxParser/test/CreateNetwork.cpp +++ b/src/armnnOnnxParser/test/CreateNetwork.cpp @@ -3,13 +3,14 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" -#include "google/protobuf/stubs/logging.h" +#include <doctest/doctest.h> -BOOST_AUTO_TEST_SUITE(OnnxParser) +#include "google/protobuf/stubs/logging.h" -BOOST_AUTO_TEST_CASE(CreateNetworkFromString) +TEST_SUITE("OnnxParser_CreateNetwork") +{ +TEST_CASE("CreateNetworkFromString") { std::string TestModel = R"( ir_version: 3 @@ -43,21 +44,21 @@ BOOST_AUTO_TEST_CASE(CreateNetworkFromString) armnnOnnxParser::IOnnxParserPtr parser(armnnOnnxParser::IOnnxParser::Create()); armnn::INetworkPtr network = parser->CreateNetworkFromString(TestModel.c_str()); - BOOST_TEST(network.get()); + CHECK(network.get()); } -BOOST_AUTO_TEST_CASE(CreateNetworkFromStringWithNullptr) +TEST_CASE("CreateNetworkFromStringWithNullptr") { armnnOnnxParser::IOnnxParserPtr parser(armnnOnnxParser::IOnnxParser::Create()); - BOOST_CHECK_THROW(parser->CreateNetworkFromString(""), armnn::InvalidArgumentException ); + CHECK_THROWS_AS(parser->CreateNetworkFromString(""), armnn::InvalidArgumentException ); } -BOOST_AUTO_TEST_CASE(CreateNetworkWithInvalidString) +TEST_CASE("CreateNetworkWithInvalidString") { auto silencer = google::protobuf::LogSilencer(); //get rid of errors from protobuf armnnOnnxParser::IOnnxParserPtr parser(armnnOnnxParser::IOnnxParser::Create()); - BOOST_CHECK_THROW(parser->CreateNetworkFromString( "I'm not a model so I should raise an error" ), + CHECK_THROWS_AS(parser->CreateNetworkFromString( "I'm not a model so I should raise an error" ), armnn::ParseException ); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/DepthConv.cpp b/src/armnnOnnxParser/test/DepthConv.cpp index fdeb21ca14..21d99bbb57 100644 --- a/src/armnnOnnxParser/test/DepthConv.cpp +++ b/src/armnnOnnxParser/test/DepthConv.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_DepthConv") +{ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { SimpleDepthConv2DFixture() @@ -153,10 +152,10 @@ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnn }; -BOOST_FIXTURE_TEST_CASE(ValidDepthConvTest, SimpleDepthConv2DFixture) +TEST_CASE_FIXTURE(SimpleDepthConv2DFixture, "ValidDepthConvTest") { RunTest<4>({{"Input", { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}}}, {{"Output", { 10, 52, 126 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Flatten.cpp b/src/armnnOnnxParser/test/Flatten.cpp index 1ba509e5e6..46ac0dfeee 100644 --- a/src/armnnOnnxParser/test/Flatten.cpp +++ b/src/armnnOnnxParser/test/Flatten.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Flatter") +{ struct FlattenMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { FlattenMainFixture(const std::string& dataType) @@ -382,7 +381,7 @@ struct FlattenInvalidAxisFixture : FlattenInvalidNegativeAxisFixture FlattenInvalidAxisFixture() : FlattenInvalidNegativeAxisFixture("1") { } }; -BOOST_FIXTURE_TEST_CASE(ValidFlattenTest, FlattenValidFixture) +TEST_CASE_FIXTURE(FlattenValidFixture, "ValidFlattenTest") { RunTest<2>({{"Input", { 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, @@ -394,7 +393,7 @@ BOOST_FIXTURE_TEST_CASE(ValidFlattenTest, FlattenValidFixture) 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f }}}); } -BOOST_FIXTURE_TEST_CASE(ValidFlattenDefaultTest, FlattenDefaultValidFixture) +TEST_CASE_FIXTURE(FlattenDefaultValidFixture, "ValidFlattenDefaultTest") { RunTest<2>({{"Input", { 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, @@ -406,7 +405,7 @@ BOOST_FIXTURE_TEST_CASE(ValidFlattenDefaultTest, FlattenDefaultValidFixture) 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f }}}); } -BOOST_FIXTURE_TEST_CASE(ValidFlattenAxisZeroTest, FlattenAxisZeroValidFixture) +TEST_CASE_FIXTURE(FlattenAxisZeroValidFixture, "ValidFlattenAxisZeroTest") { RunTest<2>({{"Input", { 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, @@ -418,7 +417,7 @@ BOOST_FIXTURE_TEST_CASE(ValidFlattenAxisZeroTest, FlattenAxisZeroValidFixture) 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f }}}); } -BOOST_FIXTURE_TEST_CASE(ValidFlattenNegativeAxisTest, FlattenNegativeAxisValidFixture) +TEST_CASE_FIXTURE(FlattenNegativeAxisValidFixture, "ValidFlattenNegativeAxisTest") { RunTest<2>({{"Input", { 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, @@ -430,14 +429,14 @@ BOOST_FIXTURE_TEST_CASE(ValidFlattenNegativeAxisTest, FlattenNegativeAxisValidFi 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f }}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeFlatten, FlattenInvalidFixture) +TEST_CASE_FIXTURE(FlattenInvalidFixture, "IncorrectDataTypeFlatten") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_FIXTURE_TEST_CASE(IncorrectAxisFlatten, FlattenInvalidAxisFixture) +TEST_CASE_FIXTURE(FlattenInvalidAxisFixture, "IncorrectAxisFlatten") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/FullyConnected.cpp b/src/armnnOnnxParser/test/FullyConnected.cpp index 133b8a6848..53094c1efe 100644 --- a/src/armnnOnnxParser/test/FullyConnected.cpp +++ b/src/armnnOnnxParser/test/FullyConnected.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_FullyConnected") +{ // A MatMul in isolation, not connected to an add. Should result in a non-biased FullyConnected layer. struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { @@ -93,7 +92,7 @@ struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser: } }; -BOOST_FIXTURE_TEST_CASE(MatMul, MatMulFixture) +TEST_CASE_FIXTURE(MatMulFixture, "MatMul") { RunTest<1>({{"Input", { 2 }}}, {{"Output", { 34 }}}); } @@ -225,7 +224,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn } }; -BOOST_FIXTURE_TEST_CASE(FullyConnected, FullyConnectedFixture) +TEST_CASE_FIXTURE(FullyConnectedFixture, "FullyConnected") { RunTest<1>({{"Input", { 3 }}}, {{"Output", { 7 }}}); } @@ -430,7 +429,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn } }; -BOOST_FIXTURE_TEST_CASE(MatMulUsedInTwoFc, MatMulUsedInTwoFcFixture) +TEST_CASE_FIXTURE(MatMulUsedInTwoFcFixture, "MatMulUsedInTwoFc") { RunTest<1>({{"Input", { 3 }}}, {{"Output", { 23 }}}); } @@ -593,9 +592,9 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt } }; -BOOST_FIXTURE_TEST_CASE(MatMulUsedInTwoFcStaggered, MatMulUsedInTwoFcStaggeredFixture) +TEST_CASE_FIXTURE(MatMulUsedInTwoFcStaggeredFixture, "MatMulUsedInTwoFcStaggered") { RunTest<1>({{"Input", { 3 }}}, {{"Output", { 13 }}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/GetInputsOutputs.cpp b/src/armnnOnnxParser/test/GetInputsOutputs.cpp index 5bb3095cc7..ac06cba410 100644 --- a/src/armnnOnnxParser/test/GetInputsOutputs.cpp +++ b/src/armnnOnnxParser/test/GetInputsOutputs.cpp @@ -2,17 +2,16 @@ // Copyright © 2017 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> + #include "../OnnxParser.hpp" #include "ParserPrototxtFixture.hpp" #include <onnx/onnx.pb.h> #include "google/protobuf/stubs/logging.h" - using ModelPtr = std::unique_ptr<onnx::ModelProto>; -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_GetInputsOutputs") +{ struct GetInputsOutputsMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { explicit GetInputsOutputsMainFixture() @@ -66,21 +65,21 @@ struct GetInputsOutputsMainFixture : public armnnUtils::ParserPrototxtFixture<ar }; -BOOST_FIXTURE_TEST_CASE(GetInput, GetInputsOutputsMainFixture) +TEST_CASE_FIXTURE(GetInputsOutputsMainFixture, "GetInput") { ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str()); std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model); - BOOST_CHECK_EQUAL(1, tensors.size()); - BOOST_CHECK_EQUAL("Input", tensors[0]); + CHECK_EQ(1, tensors.size()); + CHECK_EQ("Input", tensors[0]); } -BOOST_FIXTURE_TEST_CASE(GetOutput, GetInputsOutputsMainFixture) +TEST_CASE_FIXTURE(GetInputsOutputsMainFixture, "GetOutput") { ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str()); std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetOutputs(model); - BOOST_CHECK_EQUAL(1, tensors.size()); - BOOST_CHECK_EQUAL("Output", tensors[0]); + CHECK_EQ(1, tensors.size()); + CHECK_EQ("Output", tensors[0]); } struct GetEmptyInputsOutputsFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> @@ -137,22 +136,22 @@ struct GetEmptyInputsOutputsFixture : public armnnUtils::ParserPrototxtFixture<a } }; -BOOST_FIXTURE_TEST_CASE(GetEmptyInputs, GetEmptyInputsOutputsFixture) +TEST_CASE_FIXTURE(GetEmptyInputsOutputsFixture, "GetEmptyInputs") { ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str()); std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model); - BOOST_CHECK_EQUAL(0, tensors.size()); + CHECK_EQ(0, tensors.size()); } -BOOST_AUTO_TEST_CASE(GetInputsNullModel) +TEST_CASE("GetInputsNullModel") { - BOOST_CHECK_THROW(armnnOnnxParser::OnnxParserImpl::LoadModelFromString(""), armnn::InvalidArgumentException); + CHECK_THROWS_AS(armnnOnnxParser::OnnxParserImpl::LoadModelFromString(""), armnn::InvalidArgumentException); } -BOOST_AUTO_TEST_CASE(GetOutputsNullModel) +TEST_CASE("GetOutputsNullModel") { auto silencer = google::protobuf::LogSilencer(); //get rid of errors from protobuf - BOOST_CHECK_THROW(armnnOnnxParser::OnnxParserImpl::LoadModelFromString("nknnk"), armnn::ParseException); + CHECK_THROWS_AS(armnnOnnxParser::OnnxParserImpl::LoadModelFromString("nknnk"), armnn::ParseException); } struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> @@ -241,15 +240,13 @@ struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnn } }; -BOOST_FIXTURE_TEST_CASE(GetInputsMultipleInputs, GetInputsMultipleFixture) +TEST_CASE_FIXTURE(GetInputsMultipleFixture, "GetInputsMultipleInputs") { ModelPtr model = armnnOnnxParser::OnnxParserImpl::LoadModelFromString(m_Prototext.c_str()); std::vector<std::string> tensors = armnnOnnxParser::OnnxParserImpl::GetInputs(model); - BOOST_CHECK_EQUAL(2, tensors.size()); - BOOST_CHECK_EQUAL("Input0", tensors[0]); - BOOST_CHECK_EQUAL("Input1", tensors[1]); + CHECK_EQ(2, tensors.size()); + CHECK_EQ("Input0", tensors[0]); + CHECK_EQ("Input1", tensors[1]); } - - -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Pooling.cpp b/src/armnnOnnxParser/test/Pooling.cpp index 85bf9141a6..73d113d8e1 100644 --- a/src/armnnOnnxParser/test/Pooling.cpp +++ b/src/armnnOnnxParser/test/Pooling.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Pooling") +{ struct PoolingMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { PoolingMainFixture(const std::string& dataType, const std::string& op) @@ -110,7 +109,7 @@ struct MaxPoolInvalidFixture : PoolingMainFixture MaxPoolInvalidFixture() : PoolingMainFixture("10", "\"MaxPool\"") { } }; -BOOST_FIXTURE_TEST_CASE(ValidMaxPoolTest, MaxPoolValidFixture) +TEST_CASE_FIXTURE(MaxPoolValidFixture, "ValidMaxPoolTest") { RunTest<4>({{"Input", {1.0f, 2.0f, 3.0f, -4.0f}}}, {{"Output", {3.0f}}}); } @@ -217,12 +216,12 @@ struct PoolingWithPadFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn } }; -BOOST_FIXTURE_TEST_CASE(AveragePoolValid, AvgPoolValidFixture) +TEST_CASE_FIXTURE(AvgPoolValidFixture, "AveragePoolValid") { RunTest<4>({{"Input", {1.0f, 2.0f, 3.0f, -4.0f}}}, {{"Output", {0.5}}}); } -BOOST_FIXTURE_TEST_CASE(ValidAvgWithPadTest, PoolingWithPadFixture) +TEST_CASE_FIXTURE(PoolingWithPadFixture, "ValidAvgWithPadTest") { RunTest<4>({{"Input", {1.0f, 2.0f, 3.0f, -4.0f}}}, {{"Output", {1.0/8.0}}}); } @@ -297,14 +296,14 @@ struct GlobalAvgFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars } }; -BOOST_FIXTURE_TEST_CASE(GlobalAvgTest, GlobalAvgFixture) +TEST_CASE_FIXTURE(GlobalAvgFixture, "GlobalAvgTest") { RunTest<4>({{"Input", {1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0}}}, {{"Output", {10/4.0, 26/4.0}}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeMaxPool, MaxPoolInvalidFixture) +TEST_CASE_FIXTURE(MaxPoolInvalidFixture, "IncorrectDataTypeMaxPool") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/ProtoxtFixture.cpp b/src/armnnOnnxParser/test/ProtoxtFixture.cpp index 917f6f036b..067b440990 100644 --- a/src/armnnOnnxParser/test/ProtoxtFixture.cpp +++ b/src/armnnOnnxParser/test/ProtoxtFixture.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_PrototxtFixture") +{ struct ProtoxtTestFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { ProtoxtTestFixture() @@ -65,17 +64,17 @@ struct ProtoxtTestFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa }; -BOOST_FIXTURE_TEST_CASE(ProtoxtTest, ProtoxtTestFixture) +TEST_CASE_FIXTURE(ProtoxtTestFixture, "ProtoxtTest") { //TODO : add a test to check if the inputs and outputs are correctly inferred. } -BOOST_FIXTURE_TEST_CASE(ProtoxtTestWithBadInputs, ProtoxtTestFixture) +TEST_CASE_FIXTURE(ProtoxtTestFixture, "ProtoxtTestWithBadInputs") { - // BOOST_CHECK_THROW(RunTest<4>({{ "InexistantInput" , {0.0, 1.0, 2.0, 3.0}}}, + // CHECK_THROWS_AS(RunTest<4>({{ "InexistantInput" , {0.0, 1.0, 2.0, 3.0}}}, // {{ "InexistantOutput" , {0.0, 1.0, 2.0, 3.0}}}), // armnn::InvalidArgumentException ); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Relu.cpp b/src/armnnOnnxParser/test/Relu.cpp index a7f3bf3eec..031872e1c2 100644 --- a/src/armnnOnnxParser/test/Relu.cpp +++ b/src/armnnOnnxParser/test/Relu.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Relu") +{ struct ReluMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { ReluMainFixture() @@ -61,10 +60,10 @@ struct ReluMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParse } }; -BOOST_FIXTURE_TEST_CASE(ValidReluTest, ReluMainFixture) +TEST_CASE_FIXTURE(ReluMainFixture, "ValidReluTest") { RunTest<1>({{"Input", { -1.0f, -0.5f, 1.25f, -3.0f}}}, {{ "Output", { 0.0f, 0.0f, 1.25f, 0.0f}}}); } -BOOST_AUTO_TEST_SUITE_END() +} diff --git a/src/armnnOnnxParser/test/Reshape.cpp b/src/armnnOnnxParser/test/Reshape.cpp index 119a406d7e..e9bcd278cf 100644 --- a/src/armnnOnnxParser/test/Reshape.cpp +++ b/src/armnnOnnxParser/test/Reshape.cpp @@ -3,12 +3,11 @@ // SPDX-License-Identifier: MIT // -#include <boost/test/unit_test.hpp> #include "armnnOnnxParser/IOnnxParser.hpp" #include "ParserPrototxtFixture.hpp" -BOOST_AUTO_TEST_SUITE(OnnxParser) - +TEST_SUITE("OnnxParser_Reshape") +{ struct ReshapeMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> { ReshapeMainFixture(const std::string& dataType) @@ -189,12 +188,12 @@ struct ReshapeInvalidFixture : ReshapeMainFixture ReshapeInvalidFixture() : ReshapeMainFixture("10") { } }; -BOOST_FIXTURE_TEST_CASE(ValidReshapeTest, ReshapeValidFixture) +TEST_CASE_FIXTURE(ReshapeValidFixture, "ValidReshapeTest") { RunTest<2>({{"Input", { 0.0f, 1.0f, 2.0f, 3.0f }}}, {{"Output", { 0.0f, 1.0f, 2.0f, 3.0f }}}); } -BOOST_FIXTURE_TEST_CASE(ValidRank4ReshapeTest, ReshapeValidRank4Fixture) +TEST_CASE_FIXTURE(ReshapeValidRank4Fixture, "ValidRank4ReshapeTest") { RunTest<2>( {{"Input", @@ -207,9 +206,9 @@ BOOST_FIXTURE_TEST_CASE(ValidRank4ReshapeTest, ReshapeValidRank4Fixture) 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f}}}); } -BOOST_FIXTURE_TEST_CASE(IncorrectDataTypeReshape, ReshapeInvalidFixture) +TEST_CASE_FIXTURE(ReshapeInvalidFixture, "IncorrectDataTypeReshape") { - BOOST_CHECK_THROW(Setup(), armnn::ParseException); + CHECK_THROWS_AS(Setup(), armnn::ParseException); } -BOOST_AUTO_TEST_SUITE_END() +} |