From bb446e576e120512d5752a5d6dc1ddc636f563ba Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Thu, 2 Apr 2020 13:56:54 +0100 Subject: IVGCVSW-4483 Remove boost::polymorphic_downcast * exchange boost::polymorphic_downcast with armnn::PolymorphicDowncast * remove unnecessary includes of boost::polymorphic_downcast Signed-off-by: Jan Eilers Change-Id: Ie603fb82860fe05fee547dc78073230cc62b2e1f --- src/armnn/test/CreateWorkload.hpp | 3 ++- src/armnn/test/GraphTests.cpp | 3 ++- src/armnn/test/GraphUtils.cpp | 4 +++- src/armnn/test/OptimizerTests.cpp | 9 +++++---- src/armnn/test/QuantizerTest.cpp | 11 ++++++----- src/armnn/test/UtilityTests.cpp | 6 +++--- 6 files changed, 21 insertions(+), 15 deletions(-) (limited to 'src/armnn/test') diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 72ad9d45ef..b6ffd216e0 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -34,7 +35,7 @@ template std::unique_ptr MakeAndCheckWorkload(Layer& layer, const IWorkloadFactory& factory) { std::unique_ptr workload = layer.CreateWorkload(factory); - BOOST_TEST(workload.get() == boost::polymorphic_downcast(workload.get()), + BOOST_TEST(workload.get() == PolymorphicDowncast(workload.get()), "Cannot convert to derived class"); std::string reasonIfUnsupported; layer.SetBackendId(factory.GetBackendId()); diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp index 30e5c879ee..8e6af313b7 100644 --- a/src/armnn/test/GraphTests.cpp +++ b/src/armnn/test/GraphTests.cpp @@ -9,6 +9,7 @@ #include #include +#include #include @@ -274,7 +275,7 @@ static std::vector GetEdgeList(const armnn::Graph& graph) const unsigned int numConnections = outputSlot.GetNumConnections(); for (unsigned int c = 0; c < numConnections; ++c) { - auto inputSlot = boost::polymorphic_downcast(outputSlot.GetConnection(c)); + auto inputSlot = armnn::PolymorphicDowncast(outputSlot.GetConnection(c)); edges.emplace_back(srcLayer, &inputSlot->GetOwningLayer()); } } diff --git a/src/armnn/test/GraphUtils.cpp b/src/armnn/test/GraphUtils.cpp index 1f9bb44d3d..36db900a2d 100644 --- a/src/armnn/test/GraphUtils.cpp +++ b/src/armnn/test/GraphUtils.cpp @@ -5,6 +5,8 @@ #include "GraphUtils.hpp" +#include + bool GraphHasNamedLayer(const armnn::Graph& graph, const std::string& name) { for (auto&& layer : graph) @@ -52,7 +54,7 @@ bool IsConnected(armnn::Layer* srcLayer, armnn::Layer* destLayer, const unsigned int numConnections = outputSlot.GetNumConnections(); for (unsigned int c = 0; c < numConnections; ++c) { - auto inputSlot = boost::polymorphic_downcast(outputSlot.GetConnection(c)); + auto inputSlot = armnn::PolymorphicDowncast(outputSlot.GetConnection(c)); if (inputSlot->GetOwningLayer().GetNameStr() == destLayer->GetNameStr() && inputSlot->GetSlotIndex() == destSlot) { diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp index c7883ffdb8..ca85e11021 100644 --- a/src/armnn/test/OptimizerTests.cpp +++ b/src/armnn/test/OptimizerTests.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -695,7 +696,7 @@ BOOST_AUTO_TEST_CASE(BackendHintTest) const char* name = nullptr) override { IgnoreUnused(id, name); - auto inputLayer = boost::polymorphic_downcast(layer); + auto inputLayer = PolymorphicDowncast(layer); BOOST_TEST((inputLayer->GetBackendId() == "MockBackend")); } @@ -704,7 +705,7 @@ BOOST_AUTO_TEST_CASE(BackendHintTest) const char* name = nullptr) override { IgnoreUnused(id, name); - auto outputLayer = boost::polymorphic_downcast(layer); + auto outputLayer = PolymorphicDowncast(layer); BOOST_TEST((outputLayer->GetBackendId() == "MockBackend")); } @@ -713,7 +714,7 @@ BOOST_AUTO_TEST_CASE(BackendHintTest) const char* name = nullptr) override { IgnoreUnused(activationDescriptor, name); - auto activation = boost::polymorphic_downcast(layer); + auto activation = PolymorphicDowncast(layer); BOOST_TEST((activation->GetBackendId() == "CustomBackend")); } }; @@ -765,7 +766,7 @@ BOOST_AUTO_TEST_CASE(BackendHintTest) auto optNet = IOptimizedNetworkPtr(new OptimizedNetwork(std::move(graph)), &IOptimizedNetwork::Destroy); - OptimizedNetwork* optNetObjPtr = boost::polymorphic_downcast(optNet.get()); + OptimizedNetwork* optNetObjPtr = PolymorphicDowncast(optNet.get()); // Get the optimized graph Graph& optGraph = optNetObjPtr->GetGraph(); diff --git a/src/armnn/test/QuantizerTest.cpp b/src/armnn/test/QuantizerTest.cpp index ebdfbc5a40..669703ca54 100644 --- a/src/armnn/test/QuantizerTest.cpp +++ b/src/armnn/test/QuantizerTest.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -190,7 +191,7 @@ private: void VisitLayersTopologically(const INetwork* inputNetwork, ILayerVisitor& visitor) { - auto network = boost::polymorphic_downcast(inputNetwork); + auto network = PolymorphicDowncast(inputNetwork); auto graph = network->GetGraph().TopologicalSort(); VisitLayers(graph, visitor); @@ -346,7 +347,7 @@ BOOST_AUTO_TEST_CASE(InputOutputLayerDynamicQuant) { INetworkPtr network = CreateNetworkWithInputOutputLayers(); - armnn::TensorInfo tensorInfo = GetInputTensorInfo(boost::polymorphic_downcast(network.get())); + armnn::TensorInfo tensorInfo = GetInputTensorInfo(PolymorphicDowncast(network.get())); // Outliers -56 and 98 std::vector inputData({0, 0, 0, -56, 98, 0, 0, 0}); @@ -3033,12 +3034,12 @@ BOOST_AUTO_TEST_CASE(TestConnectionPreservationAfterDynamicQuant) reLULayer2->GetOutputSlot(0).SetTensorInfo(TensorInfo(TensorShape({1, 2, 2, 1}), DataType::Float32)); addLayer1->GetOutputSlot(0).SetTensorInfo(TensorInfo(TensorShape({1, 2, 2, 1}), DataType::Float32)); - TestConnectionPreservation visitor1(boost::polymorphic_downcast(network.get())->GetGraph()); + TestConnectionPreservation visitor1(PolymorphicDowncast(network.get())->GetGraph()); VisitLayersTopologically(network.get(), visitor1); armnn::INetworkQuantizerPtr quantizer = armnn::INetworkQuantizer::Create(network.get()); - armnn::TensorInfo tensorInfo = GetInputTensorInfo(boost::polymorphic_downcast(network.get())); + armnn::TensorInfo tensorInfo = GetInputTensorInfo(PolymorphicDowncast(network.get())); std::vector inputData({0, 2, 0, 4}); armnn::ConstTensor inputTensor(tensorInfo, inputData.data()); @@ -3049,7 +3050,7 @@ BOOST_AUTO_TEST_CASE(TestConnectionPreservationAfterDynamicQuant) INetworkPtr quantNetwork = quantizer->ExportNetwork(); - TestConnectionPreservation visitor2(boost::polymorphic_downcast(quantNetwork.get())->GetGraph()); + TestConnectionPreservation visitor2(PolymorphicDowncast(quantNetwork.get())->GetGraph()); VisitLayersTopologically(quantNetwork.get(), visitor2); } diff --git a/src/armnn/test/UtilityTests.cpp b/src/armnn/test/UtilityTests.cpp index 7be5c9518a..d5779c1a76 100644 --- a/src/armnn/test/UtilityTests.cpp +++ b/src/armnn/test/UtilityTests.cpp @@ -45,12 +45,12 @@ BOOST_AUTO_TEST_CASE(PolymorphicDowncast) Base* base1 = &child1; auto ptr1 = dynamic_cast(base1); BOOST_CHECK(ptr1 != nullptr); - BOOST_CHECK_NO_THROW(polymorphic_downcast(base1)); - BOOST_CHECK(polymorphic_downcast(base1) == ptr1); + BOOST_CHECK_NO_THROW(armnn::PolymorphicDowncast(base1)); + BOOST_CHECK(armnn::PolymorphicDowncast(base1) == ptr1); auto ptr2 = dynamic_cast(base1); BOOST_CHECK(ptr2 == nullptr); - BOOST_CHECK_THROW(polymorphic_downcast(base1), std::bad_cast); + BOOST_CHECK_THROW(armnn::PolymorphicDowncast(base1), std::bad_cast); armnn::IgnoreUnused(ptr1, ptr2); } -- cgit v1.2.1