diff options
author | Jan Eilers <jan.eilers@arm.com> | 2020-04-02 13:56:54 +0100 |
---|---|---|
committer | Jan Eilers <jan.eilers@arm.com> | 2020-04-10 10:11:11 +0100 |
commit | bb446e576e120512d5752a5d6dc1ddc636f563ba (patch) | |
tree | 147d0b5f2886af208199a24704afd845a4825bf8 /src/armnn/optimizations | |
parent | e5d0b93b152a26faf93538eb719d03e5b477d670 (diff) | |
download | armnn-bb446e576e120512d5752a5d6dc1ddc636f563ba.tar.gz |
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 <jan.eilers@arm.com>
Change-Id: Ie603fb82860fe05fee547dc78073230cc62b2e1f
Diffstat (limited to 'src/armnn/optimizations')
-rw-r--r-- | src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp | 4 | ||||
-rw-r--r-- | src/armnn/optimizations/FoldPadIntoConvolution2d.hpp | 6 | ||||
-rw-r--r-- | src/armnn/optimizations/MovePermuteUp.hpp | 3 | ||||
-rw-r--r-- | src/armnn/optimizations/MoveTransposeUp.hpp | 3 | ||||
-rw-r--r-- | src/armnn/optimizations/Optimization.hpp | 4 | ||||
-rw-r--r-- | src/armnn/optimizations/OptimizeInversePermutes.hpp | 5 | ||||
-rw-r--r-- | src/armnn/optimizations/SquashEqualSiblings.hpp | 3 |
7 files changed, 19 insertions, 9 deletions
diff --git a/src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp b/src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp index 222414c8c5..ca42cacb39 100644 --- a/src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp +++ b/src/armnn/optimizations/ConvertFp32NetworkToBf16.hpp @@ -7,6 +7,8 @@ #include "NetworkUtils.hpp" #include "Optimization.hpp" +#include <armnn/utility/PolymorphicDowncast.hpp> + namespace armnn { namespace optimizations @@ -15,7 +17,7 @@ namespace optimizations template <typename LayerT> inline LayerT* ConvertWeight(Layer* l) { - LayerT* layer = boost::polymorphic_downcast<LayerT*>(l); + LayerT* layer = PolymorphicDowncast<LayerT*>(l); if ((layer->GetType() == LayerType::Convolution2d || layer->GetType() == LayerType::FullyConnected) && layer->m_Weight) { diff --git a/src/armnn/optimizations/FoldPadIntoConvolution2d.hpp b/src/armnn/optimizations/FoldPadIntoConvolution2d.hpp index e598deb977..66fffbb280 100644 --- a/src/armnn/optimizations/FoldPadIntoConvolution2d.hpp +++ b/src/armnn/optimizations/FoldPadIntoConvolution2d.hpp @@ -7,6 +7,8 @@ #include "Optimization.hpp" +#include <armnn/utility/PolymorphicDowncast.hpp> + namespace armnn { namespace optimizations @@ -24,8 +26,8 @@ public: ARMNN_ASSERT(base.GetType() == LayerType::Pad); ARMNN_ASSERT(child.GetType() == LayerType::Convolution2d); - PadLayer* padLayer = boost::polymorphic_downcast<PadLayer*>(&base); - Convolution2dLayer* convolution2dLayer = boost::polymorphic_downcast<Convolution2dLayer*>(&child); + PadLayer* padLayer = PolymorphicDowncast<PadLayer*>(&base); + Convolution2dLayer* convolution2dLayer = PolymorphicDowncast<Convolution2dLayer*>(&child); OutputSlot* parentOut = base.GetInputSlot(0).GetConnectedOutputSlot(); const TensorInfo& outInfo = child.GetOutputHandler().GetTensorInfo(); diff --git a/src/armnn/optimizations/MovePermuteUp.hpp b/src/armnn/optimizations/MovePermuteUp.hpp index a7a477be84..15c6f61e97 100644 --- a/src/armnn/optimizations/MovePermuteUp.hpp +++ b/src/armnn/optimizations/MovePermuteUp.hpp @@ -6,6 +6,7 @@ #include "Optimization.hpp" +#include <armnn/utility/PolymorphicDowncast.hpp> #include <armnnUtils/Permute.hpp> namespace armnn @@ -29,7 +30,7 @@ public: if (CanMovePermuteToInputs(base)) { - auto permute = boost::polymorphic_downcast<PermuteLayer*>(&connection.GetOwningLayer()); + auto permute = PolymorphicDowncast<PermuteLayer*>(&connection.GetOwningLayer()); const PermutationVector& perm = permute->GetPermutation(); // Inserts an equivalent permute before every input of the base layer. diff --git a/src/armnn/optimizations/MoveTransposeUp.hpp b/src/armnn/optimizations/MoveTransposeUp.hpp index 66543069c8..86c018868e 100644 --- a/src/armnn/optimizations/MoveTransposeUp.hpp +++ b/src/armnn/optimizations/MoveTransposeUp.hpp @@ -6,6 +6,7 @@ #include "Optimization.hpp" +#include <armnn/utility/PolymorphicDowncast.hpp> #include <armnnUtils/Transpose.hpp> namespace armnn @@ -29,7 +30,7 @@ public: if (CanMoveTransposeToInputs(base)) { - auto transpose = boost::polymorphic_downcast<TransposeLayer*>(&connection.GetOwningLayer()); + auto transpose = PolymorphicDowncast<TransposeLayer*>(&connection.GetOwningLayer()); const PermutationVector& perm = transpose->GetPermutation(); // Inserts an equivalent transpose before every input of the base layer. diff --git a/src/armnn/optimizations/Optimization.hpp b/src/armnn/optimizations/Optimization.hpp index efe3930db8..565f543bee 100644 --- a/src/armnn/optimizations/Optimization.hpp +++ b/src/armnn/optimizations/Optimization.hpp @@ -7,6 +7,8 @@ #include "Graph.hpp" #include "LayersFwd.hpp" +#include <armnn/utility/PolymorphicDowncast.hpp> + namespace armnn { @@ -37,7 +39,7 @@ public: { if (base.GetType() == LayerEnumOf<BaseType>()) { - Wrapped::Run(graph, *boost::polymorphic_downcast<BaseType*>(&base)); + Wrapped::Run(graph, *PolymorphicDowncast<BaseType*>(&base)); } } diff --git a/src/armnn/optimizations/OptimizeInversePermutes.hpp b/src/armnn/optimizations/OptimizeInversePermutes.hpp index 98e87c36c6..fe0b312ce0 100644 --- a/src/armnn/optimizations/OptimizeInversePermutes.hpp +++ b/src/armnn/optimizations/OptimizeInversePermutes.hpp @@ -7,6 +7,7 @@ #include "Optimization.hpp" #include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> namespace armnn { @@ -23,9 +24,9 @@ public: { IgnoreUnused(graph); Layer& base = connection.GetConnectedOutputSlot()->GetOwningLayer(); - auto child = boost::polymorphic_downcast<PermuteType*>(&connection.GetOwningLayer()); + auto child = PolymorphicDowncast<PermuteType*>(&connection.GetOwningLayer()); - if (child->IsInverse(*boost::polymorphic_downcast<PermuteType*>(&base))) + if (child->IsInverse(*PolymorphicDowncast<PermuteType*>(&base))) { // Bypass both layers. Child will be removed as it's left unconnected. // Base layer will be removed if left unconnected. diff --git a/src/armnn/optimizations/SquashEqualSiblings.hpp b/src/armnn/optimizations/SquashEqualSiblings.hpp index bac27c06a7..d836a9c549 100644 --- a/src/armnn/optimizations/SquashEqualSiblings.hpp +++ b/src/armnn/optimizations/SquashEqualSiblings.hpp @@ -7,6 +7,7 @@ #include "Optimization.hpp" #include <armnn/utility/IgnoreUnused.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> namespace armnn { @@ -32,7 +33,7 @@ public: if (baseOutput.GetNumConnections() > 1) { - auto& comparableChild = *boost::polymorphic_downcast<Comparable*>(&child); + auto& comparableChild = *PolymorphicDowncast<Comparable*>(&child); Layer* lowestPriorityChild = &child; for (auto&& it : baseOutput.GetConnections()) |