diff options
Diffstat (limited to 'src/armnn/layers')
144 files changed, 324 insertions, 0 deletions
diff --git a/src/armnn/layers/AbsLayer.cpp b/src/armnn/layers/AbsLayer.cpp index 7aa4099641..e103b7fad3 100644 --- a/src/armnn/layers/AbsLayer.cpp +++ b/src/armnn/layers/AbsLayer.cpp @@ -46,9 +46,11 @@ void AbsLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "AbsLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void AbsLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitAbsLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn
\ No newline at end of file diff --git a/src/armnn/layers/AbsLayer.hpp b/src/armnn/layers/AbsLayer.hpp index 0e5ccb042a..9ab66624f6 100644 --- a/src/armnn/layers/AbsLayer.hpp +++ b/src/armnn/layers/AbsLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create an AbsLayer. diff --git a/src/armnn/layers/ActivationLayer.cpp b/src/armnn/layers/ActivationLayer.cpp index 7bfa28ef73..3abb4c46da 100644 --- a/src/armnn/layers/ActivationLayer.cpp +++ b/src/armnn/layers/ActivationLayer.cpp @@ -45,9 +45,11 @@ void ActivationLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ActivationLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ActivationLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitActivationLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ActivationLayer.hpp b/src/armnn/layers/ActivationLayer.hpp index 5ffcc3e1f5..47b7f66280 100644 --- a/src/armnn/layers/ActivationLayer.hpp +++ b/src/armnn/layers/ActivationLayer.hpp @@ -26,7 +26,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: diff --git a/src/armnn/layers/AdditionLayer.cpp b/src/armnn/layers/AdditionLayer.cpp index 8b1f2a8dff..b6db7062be 100644 --- a/src/armnn/layers/AdditionLayer.cpp +++ b/src/armnn/layers/AdditionLayer.cpp @@ -32,9 +32,11 @@ AdditionLayer* AdditionLayer::Clone(Graph& graph) const return CloneBase<AdditionLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void AdditionLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitAdditionLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/AdditionLayer.hpp b/src/armnn/layers/AdditionLayer.hpp index 4af576a130..71a8553078 100644 --- a/src/armnn/layers/AdditionLayer.hpp +++ b/src/armnn/layers/AdditionLayer.hpp @@ -23,7 +23,9 @@ public: /// @param [in] graph The graph into which this layer is being cloned. AdditionLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create an AdditionLayer. diff --git a/src/armnn/layers/ArgMinMaxLayer.cpp b/src/armnn/layers/ArgMinMaxLayer.cpp index 219f34682c..5e469a4d07 100644 --- a/src/armnn/layers/ArgMinMaxLayer.cpp +++ b/src/armnn/layers/ArgMinMaxLayer.cpp @@ -86,9 +86,11 @@ void ArgMinMaxLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ArgMinMaxLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ArgMinMaxLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitArgMinMaxLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ArgMinMaxLayer.hpp b/src/armnn/layers/ArgMinMaxLayer.hpp index 761d4a0a36..f2125361ce 100644 --- a/src/armnn/layers/ArgMinMaxLayer.hpp +++ b/src/armnn/layers/ArgMinMaxLayer.hpp @@ -34,7 +34,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ArgMinMaxLayer. diff --git a/src/armnn/layers/BatchNormalizationLayer.cpp b/src/armnn/layers/BatchNormalizationLayer.cpp index e3ee643ac5..e52b986add 100644 --- a/src/armnn/layers/BatchNormalizationLayer.cpp +++ b/src/armnn/layers/BatchNormalizationLayer.cpp @@ -70,6 +70,7 @@ Layer::ConstantTensors BatchNormalizationLayer::GetConstantTensorsByRef() return {m_Mean, m_Variance, m_Beta, m_Gamma}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void BatchNormalizationLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedMean(m_Mean); @@ -85,6 +86,7 @@ void BatchNormalizationLayer::Accept(ILayerVisitor& visitor) const visitor.VisitBatchNormalizationLayer( this, GetParameters(), meanTensor, varianceTensor, betaTensor, gammaTensor, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void BatchNormalizationLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/BatchNormalizationLayer.hpp b/src/armnn/layers/BatchNormalizationLayer.hpp index 2777633a34..10ca7eca25 100644 --- a/src/armnn/layers/BatchNormalizationLayer.hpp +++ b/src/armnn/layers/BatchNormalizationLayer.hpp @@ -39,7 +39,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/BatchToSpaceNdLayer.cpp b/src/armnn/layers/BatchToSpaceNdLayer.cpp index 4b33b96229..0b6eab54f0 100644 --- a/src/armnn/layers/BatchToSpaceNdLayer.cpp +++ b/src/armnn/layers/BatchToSpaceNdLayer.cpp @@ -95,9 +95,11 @@ std::vector<TensorShape> BatchToSpaceNdLayer::InferOutputShapes(const std::vecto return std::vector<TensorShape>({ outputShape }); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void BatchToSpaceNdLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitBatchToSpaceNdLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/BatchToSpaceNdLayer.hpp b/src/armnn/layers/BatchToSpaceNdLayer.hpp index da7585b51e..bb6eb7129d 100644 --- a/src/armnn/layers/BatchToSpaceNdLayer.hpp +++ b/src/armnn/layers/BatchToSpaceNdLayer.hpp @@ -34,7 +34,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a BatchToSpaceNdLayer. diff --git a/src/armnn/layers/CastLayer.cpp b/src/armnn/layers/CastLayer.cpp index 16dd9a3744..485bbf0158 100644 --- a/src/armnn/layers/CastLayer.cpp +++ b/src/armnn/layers/CastLayer.cpp @@ -46,10 +46,12 @@ void CastLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "CastLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void CastLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("CastLayer VisitCastLayer is not implemented"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/CastLayer.hpp b/src/armnn/layers/CastLayer.hpp index 8a9ea43934..e0448131a2 100644 --- a/src/armnn/layers/CastLayer.hpp +++ b/src/armnn/layers/CastLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a CastLayer. diff --git a/src/armnn/layers/ChannelShuffleLayer.cpp b/src/armnn/layers/ChannelShuffleLayer.cpp index a3b85f1ba7..884f3ab03d 100644 --- a/src/armnn/layers/ChannelShuffleLayer.cpp +++ b/src/armnn/layers/ChannelShuffleLayer.cpp @@ -46,9 +46,12 @@ void ChannelShuffleLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ChannelShuffleLayer"); } + +ARMNN_NO_DEPRECATE_WARN_BEGIN void ChannelShuffleLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("ChannelShuffleLayer: VisitChannelShuffleLayer is not implemented"); } +ARMNN_NO_DEPRECATE_WARN_END }
\ No newline at end of file diff --git a/src/armnn/layers/ChannelShuffleLayer.hpp b/src/armnn/layers/ChannelShuffleLayer.hpp index 399b651f5e..903d161107 100644 --- a/src/armnn/layers/ChannelShuffleLayer.hpp +++ b/src/armnn/layers/ChannelShuffleLayer.hpp @@ -11,7 +11,9 @@ namespace armnn class ChannelShuffleLayer : public LayerWithParameters<ChannelShuffleDescriptor> { public: + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END /// Creates a dynamically-allocated copy of this layer. /// @param graph The graph into which this layer is being cloned diff --git a/src/armnn/layers/ComparisonLayer.cpp b/src/armnn/layers/ComparisonLayer.cpp index 399834d72d..c644cb17c7 100644 --- a/src/armnn/layers/ComparisonLayer.cpp +++ b/src/armnn/layers/ComparisonLayer.cpp @@ -74,9 +74,11 @@ void ComparisonLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ComparisonLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ComparisonLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitComparisonLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ComparisonLayer.hpp b/src/armnn/layers/ComparisonLayer.hpp index bcb0dc2fdd..07534afab1 100644 --- a/src/armnn/layers/ComparisonLayer.hpp +++ b/src/armnn/layers/ComparisonLayer.hpp @@ -35,7 +35,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ComparisonLayer diff --git a/src/armnn/layers/ConcatLayer.cpp b/src/armnn/layers/ConcatLayer.cpp index 238fdb66d9..892c18e62c 100644 --- a/src/armnn/layers/ConcatLayer.cpp +++ b/src/armnn/layers/ConcatLayer.cpp @@ -318,9 +318,11 @@ void ConcatLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ConcatLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConcatLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitConcatLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn armnn diff --git a/src/armnn/layers/ConcatLayer.hpp b/src/armnn/layers/ConcatLayer.hpp index 4315d66436..fefedea608 100644 --- a/src/armnn/layers/ConcatLayer.hpp +++ b/src/armnn/layers/ConcatLayer.hpp @@ -44,7 +44,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ConcatLayer. diff --git a/src/armnn/layers/ConstantLayer.cpp b/src/armnn/layers/ConstantLayer.cpp index feeb762263..e738e59bdb 100644 --- a/src/armnn/layers/ConstantLayer.cpp +++ b/src/armnn/layers/ConstantLayer.cpp @@ -62,12 +62,14 @@ void ConstantLayer::ValidateTensorShapesFromInputs() outShape); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConstantLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedLayerOutput(m_LayerOutput); ConstTensor layerOutputTensor(managedLayerOutput.GetTensorInfo(), managedLayerOutput.Map()); visitor.VisitConstantLayer(this, layerOutputTensor, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void ConstantLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/ConstantLayer.hpp b/src/armnn/layers/ConstantLayer.hpp index ead8816684..a9a9d37f54 100644 --- a/src/armnn/layers/ConstantLayer.hpp +++ b/src/armnn/layers/ConstantLayer.hpp @@ -39,7 +39,9 @@ public: /// Free up the constant source data stored by the layer. void ReleaseConstantData() override {} + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp index 3577723a38..b7fa3a6b3f 100644 --- a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp +++ b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp @@ -47,6 +47,7 @@ void ConvertBf16ToFp32Layer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ConvertBf16ToFp32Layer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConvertBf16ToFp32Layer::Accept(ILayerVisitor& visitor) const { // these conversion layers are only inserted by the @@ -54,5 +55,6 @@ void ConvertBf16ToFp32Layer::Accept(ILayerVisitor& visitor) const IgnoreUnused(visitor); throw armnn::Exception("ConvertBf16ToFp32Layer should never appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ConvertBf16ToFp32Layer.hpp b/src/armnn/layers/ConvertBf16ToFp32Layer.hpp index d9df0bdf38..d2c006655c 100644 --- a/src/armnn/layers/ConvertBf16ToFp32Layer.hpp +++ b/src/armnn/layers/ConvertBf16ToFp32Layer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ConvertBf16ToFp32Layer. diff --git a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp index 3b6f72c440..77e6f668ac 100644 --- a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp +++ b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp @@ -47,6 +47,7 @@ void ConvertFp16ToFp32Layer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ConvertFp16ToFp32Layer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConvertFp16ToFp32Layer::Accept(ILayerVisitor& visitor) const { // these conversion layers are only inserted by the @@ -54,5 +55,6 @@ void ConvertFp16ToFp32Layer::Accept(ILayerVisitor& visitor) const IgnoreUnused(visitor); throw armnn::Exception("ConvertFp16ToFp32Layer should never appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ConvertFp16ToFp32Layer.hpp b/src/armnn/layers/ConvertFp16ToFp32Layer.hpp index 4eadb9f11a..59faf6486d 100644 --- a/src/armnn/layers/ConvertFp16ToFp32Layer.hpp +++ b/src/armnn/layers/ConvertFp16ToFp32Layer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ConvertFp16ToFp32Layer. diff --git a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp index f909769b9d..6a003dc922 100644 --- a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp +++ b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp @@ -48,6 +48,7 @@ void ConvertFp32ToBf16Layer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "LayerName"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConvertFp32ToBf16Layer::Accept(ILayerVisitor& visitor) const { // these conversion layers are only inserted by the @@ -55,5 +56,6 @@ void ConvertFp32ToBf16Layer::Accept(ILayerVisitor& visitor) const IgnoreUnused(visitor); throw armnn::Exception("ConvertFp32ToBf16Layer should never appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ConvertFp32ToBf16Layer.hpp b/src/armnn/layers/ConvertFp32ToBf16Layer.hpp index 57fbe13e12..8e33cb2d6a 100644 --- a/src/armnn/layers/ConvertFp32ToBf16Layer.hpp +++ b/src/armnn/layers/ConvertFp32ToBf16Layer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ConvertFp32ToBf16Layer. diff --git a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp index 3e6f055a4a..8c96909215 100644 --- a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp +++ b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp @@ -47,6 +47,7 @@ void ConvertFp32ToFp16Layer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "LayerName"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ConvertFp32ToFp16Layer::Accept(ILayerVisitor& visitor) const { // These conversion layers are only inserted by the @@ -54,5 +55,6 @@ void ConvertFp32ToFp16Layer::Accept(ILayerVisitor& visitor) const IgnoreUnused(visitor); throw armnn::Exception("ConvertFp32ToFp16Layer should never appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ConvertFp32ToFp16Layer.hpp b/src/armnn/layers/ConvertFp32ToFp16Layer.hpp index 5652a472a2..e331c7d59a 100644 --- a/src/armnn/layers/ConvertFp32ToFp16Layer.hpp +++ b/src/armnn/layers/ConvertFp32ToFp16Layer.hpp @@ -27,7 +27,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ConvertFp32ToFp16Layer. diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index b7bf0462d8..ae29d833e8 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -143,6 +143,7 @@ Layer::ConstantTensors Convolution2dLayer::GetConstantTensorsByRef() return {m_Weight, m_Bias}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void Convolution2dLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedWeight(m_Weight); @@ -158,6 +159,7 @@ void Convolution2dLayer::Accept(ILayerVisitor& visitor) const visitor.VisitConvolution2dLayer(this, GetParameters(), weightsTensor, optionalBiasTensor, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void Convolution2dLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/Convolution2dLayer.hpp b/src/armnn/layers/Convolution2dLayer.hpp index a33cda27cb..844747831c 100644 --- a/src/armnn/layers/Convolution2dLayer.hpp +++ b/src/armnn/layers/Convolution2dLayer.hpp @@ -42,7 +42,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/DebugLayer.cpp b/src/armnn/layers/DebugLayer.cpp index ade09ed3d4..07d59be7a3 100644 --- a/src/armnn/layers/DebugLayer.cpp +++ b/src/armnn/layers/DebugLayer.cpp @@ -52,11 +52,13 @@ void DebugLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "DebugLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DebugLayer::Accept(ILayerVisitor& visitor) const { // by design debug layers are never in input graphs IgnoreUnused(visitor); throw armnn::Exception("DebugLayer should never appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/DebugLayer.hpp b/src/armnn/layers/DebugLayer.hpp index e71e05a8d5..054f5e4d2b 100644 --- a/src/armnn/layers/DebugLayer.hpp +++ b/src/armnn/layers/DebugLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a DebugLayer. diff --git a/src/armnn/layers/DepthToSpaceLayer.cpp b/src/armnn/layers/DepthToSpaceLayer.cpp index dfa575b7a3..ba06ad6c31 100644 --- a/src/armnn/layers/DepthToSpaceLayer.cpp +++ b/src/armnn/layers/DepthToSpaceLayer.cpp @@ -75,9 +75,11 @@ void DepthToSpaceLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "DepthToSpaceLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DepthToSpaceLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitDepthToSpaceLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/DepthToSpaceLayer.hpp b/src/armnn/layers/DepthToSpaceLayer.hpp index 0730d4d3ea..d9f6752cbd 100644 --- a/src/armnn/layers/DepthToSpaceLayer.hpp +++ b/src/armnn/layers/DepthToSpaceLayer.hpp @@ -35,7 +35,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a DepthToSpaceLayer. diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index ed52b39050..86c994745c 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -148,6 +148,7 @@ Layer::ConstantTensors DepthwiseConvolution2dLayer::GetConstantTensorsByRef() return {m_Weight, m_Bias}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DepthwiseConvolution2dLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedWeight(m_Weight); @@ -163,6 +164,7 @@ void DepthwiseConvolution2dLayer::Accept(ILayerVisitor& visitor) const visitor.VisitDepthwiseConvolution2dLayer(this, GetParameters(), weightsTensor, optionalBiasTensor, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void DepthwiseConvolution2dLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp index 51f6ea9453..8f8f020a0f 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.hpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.hpp @@ -41,7 +41,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/DequantizeLayer.cpp b/src/armnn/layers/DequantizeLayer.cpp index cbe9ae17b5..f8a2e057ac 100644 --- a/src/armnn/layers/DequantizeLayer.cpp +++ b/src/armnn/layers/DequantizeLayer.cpp @@ -46,9 +46,11 @@ void DequantizeLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "DequantizeLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DequantizeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitDequantizeLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/DequantizeLayer.hpp b/src/armnn/layers/DequantizeLayer.hpp index a5750ddaab..99bde85f72 100644 --- a/src/armnn/layers/DequantizeLayer.hpp +++ b/src/armnn/layers/DequantizeLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a DequantizeLayer. diff --git a/src/armnn/layers/DetectionPostProcessLayer.cpp b/src/armnn/layers/DetectionPostProcessLayer.cpp index bd94d1d281..41c44d08a9 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.cpp +++ b/src/armnn/layers/DetectionPostProcessLayer.cpp @@ -78,6 +78,7 @@ Layer::ConstantTensors DetectionPostProcessLayer::GetConstantTensorsByRef() return { m_Anchors }; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DetectionPostProcessLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedAnchors(m_Anchors); @@ -85,6 +86,7 @@ void DetectionPostProcessLayer::Accept(ILayerVisitor& visitor) const visitor.VisitDetectionPostProcessLayer(this, GetParameters(), anchorTensor, GetName()); m_Anchors->Unmap(); } +ARMNN_NO_DEPRECATE_WARN_END void DetectionPostProcessLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/DetectionPostProcessLayer.hpp b/src/armnn/layers/DetectionPostProcessLayer.hpp index b409134c1c..1826645fc6 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.hpp +++ b/src/armnn/layers/DetectionPostProcessLayer.hpp @@ -34,7 +34,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/DivisionLayer.cpp b/src/armnn/layers/DivisionLayer.cpp index 5b032ce998..17b671a5f4 100644 --- a/src/armnn/layers/DivisionLayer.cpp +++ b/src/armnn/layers/DivisionLayer.cpp @@ -32,9 +32,11 @@ DivisionLayer* DivisionLayer::Clone(Graph& graph) const return CloneBase<DivisionLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void DivisionLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitDivisionLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/DivisionLayer.hpp b/src/armnn/layers/DivisionLayer.hpp index 4427a4c4cb..91bccfc184 100644 --- a/src/armnn/layers/DivisionLayer.hpp +++ b/src/armnn/layers/DivisionLayer.hpp @@ -24,7 +24,9 @@ public: /// @param [in] graph The graph into which this layer is being cloned. DivisionLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a DivisionLayer. diff --git a/src/armnn/layers/ElementwiseUnaryLayer.cpp b/src/armnn/layers/ElementwiseUnaryLayer.cpp index 8c94106818..6f07cf93f9 100644 --- a/src/armnn/layers/ElementwiseUnaryLayer.cpp +++ b/src/armnn/layers/ElementwiseUnaryLayer.cpp @@ -61,9 +61,11 @@ void ElementwiseUnaryLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, GetLayerTypeAsCString(GetType())); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ElementwiseUnaryLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitElementwiseUnaryLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ElementwiseUnaryLayer.hpp b/src/armnn/layers/ElementwiseUnaryLayer.hpp index f6f8862da4..1261882e0b 100644 --- a/src/armnn/layers/ElementwiseUnaryLayer.hpp +++ b/src/armnn/layers/ElementwiseUnaryLayer.hpp @@ -34,7 +34,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a ElementwiseUnaryLayer diff --git a/src/armnn/layers/FakeQuantizationLayer.cpp b/src/armnn/layers/FakeQuantizationLayer.cpp index 102a6725a7..69f0166d0e 100644 --- a/src/armnn/layers/FakeQuantizationLayer.cpp +++ b/src/armnn/layers/FakeQuantizationLayer.cpp @@ -46,11 +46,13 @@ void FakeQuantizationLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "FakeQuantizationLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void FakeQuantizationLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("FakeQuantizationLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END void FakeQuantizationLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/FakeQuantizationLayer.hpp b/src/armnn/layers/FakeQuantizationLayer.hpp index 78e49e6474..c115c63f33 100644 --- a/src/armnn/layers/FakeQuantizationLayer.hpp +++ b/src/armnn/layers/FakeQuantizationLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/FillLayer.cpp b/src/armnn/layers/FillLayer.cpp index 41471c3412..45fe07244b 100644 --- a/src/armnn/layers/FillLayer.cpp +++ b/src/armnn/layers/FillLayer.cpp @@ -51,9 +51,11 @@ void FillLayer::ValidateTensorShapesFromInputs() inferredShapes[0][0]); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void FillLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitFillLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/FillLayer.hpp b/src/armnn/layers/FillLayer.hpp index eeed141128..096d9ba7dc 100644 --- a/src/armnn/layers/FillLayer.hpp +++ b/src/armnn/layers/FillLayer.hpp @@ -27,7 +27,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a FillLayer. diff --git a/src/armnn/layers/FloorLayer.cpp b/src/armnn/layers/FloorLayer.cpp index e03bdb16ff..a975ee8d97 100644 --- a/src/armnn/layers/FloorLayer.cpp +++ b/src/armnn/layers/FloorLayer.cpp @@ -45,9 +45,11 @@ void FloorLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "FloorLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void FloorLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitFloorLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/FloorLayer.hpp b/src/armnn/layers/FloorLayer.hpp index 07cf151a8a..2b16cfab26 100644 --- a/src/armnn/layers/FloorLayer.hpp +++ b/src/armnn/layers/FloorLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a FloorLayer. diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp index 259d4149c8..2c41d74923 100644 --- a/src/armnn/layers/FullyConnectedLayer.cpp +++ b/src/armnn/layers/FullyConnectedLayer.cpp @@ -80,10 +80,12 @@ Layer::ConstantTensors FullyConnectedLayer::GetConstantTensorsByRef() return {m_Weight, m_Bias}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void FullyConnectedLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitFullyConnectedLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void FullyConnectedLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/FullyConnectedLayer.hpp b/src/armnn/layers/FullyConnectedLayer.hpp index 5639bf27b4..e97282d73f 100644 --- a/src/armnn/layers/FullyConnectedLayer.hpp +++ b/src/armnn/layers/FullyConnectedLayer.hpp @@ -43,7 +43,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/GatherLayer.cpp b/src/armnn/layers/GatherLayer.cpp index cdbdaabcdc..e8b67b8348 100644 --- a/src/armnn/layers/GatherLayer.cpp +++ b/src/armnn/layers/GatherLayer.cpp @@ -83,9 +83,11 @@ void GatherLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "GatherLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void GatherLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitGatherLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/GatherLayer.hpp b/src/armnn/layers/GatherLayer.hpp index 3bc8c69bc4..8c294079c3 100644 --- a/src/armnn/layers/GatherLayer.hpp +++ b/src/armnn/layers/GatherLayer.hpp @@ -34,7 +34,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a GatherLayer. diff --git a/src/armnn/layers/InputLayer.cpp b/src/armnn/layers/InputLayer.cpp index 0f96611792..21246f146b 100644 --- a/src/armnn/layers/InputLayer.cpp +++ b/src/armnn/layers/InputLayer.cpp @@ -35,9 +35,11 @@ void InputLayer::ValidateTensorShapesFromInputs() "InputLayer should already have the TensorInfo set."); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void InputLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitInputLayer(this, this->GetBindingId(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace diff --git a/src/armnn/layers/InputLayer.hpp b/src/armnn/layers/InputLayer.hpp index ff6b521bf0..2b73dcec35 100644 --- a/src/armnn/layers/InputLayer.hpp +++ b/src/armnn/layers/InputLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create an InputLayer. diff --git a/src/armnn/layers/InstanceNormalizationLayer.cpp b/src/armnn/layers/InstanceNormalizationLayer.cpp index 87c6877df8..657b44220d 100644 --- a/src/armnn/layers/InstanceNormalizationLayer.cpp +++ b/src/armnn/layers/InstanceNormalizationLayer.cpp @@ -46,9 +46,11 @@ void InstanceNormalizationLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "InstanceNormalizationLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void InstanceNormalizationLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitInstanceNormalizationLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/InstanceNormalizationLayer.hpp b/src/armnn/layers/InstanceNormalizationLayer.hpp index 799cf28f8c..addd61e4f8 100644 --- a/src/armnn/layers/InstanceNormalizationLayer.hpp +++ b/src/armnn/layers/InstanceNormalizationLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validate. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a InstanceNormalizationLayer. diff --git a/src/armnn/layers/L2NormalizationLayer.cpp b/src/armnn/layers/L2NormalizationLayer.cpp index c96e708075..7bddbf1f18 100644 --- a/src/armnn/layers/L2NormalizationLayer.cpp +++ b/src/armnn/layers/L2NormalizationLayer.cpp @@ -46,9 +46,11 @@ void L2NormalizationLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "L2NormalizationLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void L2NormalizationLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitL2NormalizationLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/L2NormalizationLayer.hpp b/src/armnn/layers/L2NormalizationLayer.hpp index 5d58077ba8..21072b20a0 100644 --- a/src/armnn/layers/L2NormalizationLayer.hpp +++ b/src/armnn/layers/L2NormalizationLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a L2NormalizationLayer. diff --git a/src/armnn/layers/LogSoftmaxLayer.cpp b/src/armnn/layers/LogSoftmaxLayer.cpp index 24e79ce8ae..ea2518289f 100644 --- a/src/armnn/layers/LogSoftmaxLayer.cpp +++ b/src/armnn/layers/LogSoftmaxLayer.cpp @@ -45,9 +45,11 @@ void LogSoftmaxLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "LogSoftmaxLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void LogSoftmaxLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitLogSoftmaxLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/LogSoftmaxLayer.hpp b/src/armnn/layers/LogSoftmaxLayer.hpp index b21bece98d..9963f85f30 100644 --- a/src/armnn/layers/LogSoftmaxLayer.hpp +++ b/src/armnn/layers/LogSoftmaxLayer.hpp @@ -29,7 +29,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a LogSoftmaxLayer. diff --git a/src/armnn/layers/LogicalBinaryLayer.cpp b/src/armnn/layers/LogicalBinaryLayer.cpp index 0ae5ea5641..3940b85e7b 100644 --- a/src/armnn/layers/LogicalBinaryLayer.cpp +++ b/src/armnn/layers/LogicalBinaryLayer.cpp @@ -72,9 +72,11 @@ void LogicalBinaryLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "LogicalBinaryLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void LogicalBinaryLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitLogicalBinaryLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/LogicalBinaryLayer.hpp b/src/armnn/layers/LogicalBinaryLayer.hpp index c6b024b36b..caeaa0a1af 100644 --- a/src/armnn/layers/LogicalBinaryLayer.hpp +++ b/src/armnn/layers/LogicalBinaryLayer.hpp @@ -35,7 +35,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a LogicalBinaryLayer diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp index 0fea668b97..a18fdb062a 100644 --- a/src/armnn/layers/LstmLayer.cpp +++ b/src/armnn/layers/LstmLayer.cpp @@ -300,6 +300,7 @@ Layer::ConstantTensors LstmLayer::GetConstantTensorsByRef() m_LayerNormParameters.m_OutputLayerNormWeights}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void LstmLayer::Accept(ILayerVisitor& visitor) const { LstmInputParams inputParams; @@ -509,6 +510,7 @@ void LstmLayer::Accept(ILayerVisitor& visitor) const visitor.VisitLstmLayer(this, GetParameters(), inputParams, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void LstmLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/LstmLayer.hpp b/src/armnn/layers/LstmLayer.hpp index dc6d12a1d8..fbcc03dd6f 100644 --- a/src/armnn/layers/LstmLayer.hpp +++ b/src/armnn/layers/LstmLayer.hpp @@ -44,7 +44,9 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/MapLayer.cpp b/src/armnn/layers/MapLayer.cpp index 608a71eba6..6defdab076 100644 --- a/src/armnn/layers/MapLayer.cpp +++ b/src/armnn/layers/MapLayer.cpp @@ -41,10 +41,12 @@ void MapLayer::ValidateTensorShapesFromInputs() ARMNN_ASSERT(GetNumOutputSlots() == 0); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MapLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("MapLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MapLayer.hpp b/src/armnn/layers/MapLayer.hpp index 620caf73e9..d82c44a36f 100644 --- a/src/armnn/layers/MapLayer.hpp +++ b/src/armnn/layers/MapLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a MapLayer. diff --git a/src/armnn/layers/MaximumLayer.cpp b/src/armnn/layers/MaximumLayer.cpp index d57e9e63ab..95faeea2f2 100644 --- a/src/armnn/layers/MaximumLayer.cpp +++ b/src/armnn/layers/MaximumLayer.cpp @@ -31,9 +31,11 @@ MaximumLayer* MaximumLayer::Clone(Graph& graph) const return CloneBase<MaximumLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MaximumLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitMaximumLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MaximumLayer.hpp b/src/armnn/layers/MaximumLayer.hpp index 743f79b373..f032b8867d 100644 --- a/src/armnn/layers/MaximumLayer.hpp +++ b/src/armnn/layers/MaximumLayer.hpp @@ -24,7 +24,9 @@ public: /// @param [in] graph The graph into which this layer is being cloned. MaximumLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a MaximumLayer. diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp index 9d4265cdcf..b704e2a336 100644 --- a/src/armnn/layers/MeanLayer.cpp +++ b/src/armnn/layers/MeanLayer.cpp @@ -103,9 +103,11 @@ void MeanLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShape, m_ShapeInferenceMethod, "MeanLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MeanLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitMeanLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MeanLayer.hpp b/src/armnn/layers/MeanLayer.hpp index 3a094bf6fe..94b0cbe1a3 100644 --- a/src/armnn/layers/MeanLayer.hpp +++ b/src/armnn/layers/MeanLayer.hpp @@ -29,7 +29,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END protected: /// Constructor to create a MeanLayer. diff --git a/src/armnn/layers/MemCopyLayer.cpp b/src/armnn/layers/MemCopyLayer.cpp index 40c1b98012..61fa462e94 100644 --- a/src/armnn/layers/MemCopyLayer.cpp +++ b/src/armnn/layers/MemCopyLayer.cpp @@ -49,11 +49,13 @@ void MemCopyLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "MemCopyLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MemCopyLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("MemCopyLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END void MemCopyLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/MemCopyLayer.hpp b/src/armnn/layers/MemCopyLayer.hpp index b913c529e5..3c6fd0d8d7 100644 --- a/src/armnn/layers/MemCopyLayer.hpp +++ b/src/armnn/layers/MemCopyLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/MemImportLayer.cpp b/src/armnn/layers/MemImportLayer.cpp index c96f92bc5e..689678e693 100644 --- a/src/armnn/layers/MemImportLayer.cpp +++ b/src/armnn/layers/MemImportLayer.cpp @@ -49,11 +49,13 @@ void MemImportLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "MemImportLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MemImportLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("MemImportLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END void MemImportLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/MemImportLayer.hpp b/src/armnn/layers/MemImportLayer.hpp index 47379701c7..778770132c 100644 --- a/src/armnn/layers/MemImportLayer.hpp +++ b/src/armnn/layers/MemImportLayer.hpp @@ -28,7 +28,9 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/MergeLayer.cpp b/src/armnn/layers/MergeLayer.cpp index 74a31a87b8..2bd29f286d 100644 --- a/src/armnn/layers/MergeLayer.cpp +++ b/src/armnn/layers/MergeLayer.cpp @@ -58,9 +58,11 @@ std::vector<TensorShape> MergeLayer::InferOutputShapes(const std::vector<TensorS return {inputShapes[0]}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MergeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitMergeLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MergeLayer.hpp b/src/armnn/layers/MergeLayer.hpp index 07f69004b5..d7cfcf3d1f 100644 --- a/src/armnn/layers/MergeLayer.hpp +++ b/src/armnn/layers/MergeLayer.hpp @@ -33,7 +33,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a MergeLayer. diff --git a/src/armnn/layers/MinimumLayer.cpp b/src/armnn/layers/MinimumLayer.cpp index f60815ed6b..38ab442fd5 100644 --- a/src/armnn/layers/MinimumLayer.cpp +++ b/src/armnn/layers/MinimumLayer.cpp @@ -32,9 +32,11 @@ MinimumLayer* MinimumLayer::Clone(Graph& graph) const return CloneBase<MinimumLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MinimumLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitMinimumLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MinimumLayer.hpp b/src/armnn/layers/MinimumLayer.hpp index 2db06292fd..634591e935 100644 --- a/src/armnn/layers/MinimumLayer.hpp +++ b/src/armnn/layers/MinimumLayer.hpp @@ -24,7 +24,10 @@ public: /// @param [in] graph The graph into which this layer is being cloned. MinimumLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a MinimumLayer. diff --git a/src/armnn/layers/MultiplicationLayer.cpp b/src/armnn/layers/MultiplicationLayer.cpp index 8fc13aca76..4ff188cc37 100644 --- a/src/armnn/layers/MultiplicationLayer.cpp +++ b/src/armnn/layers/MultiplicationLayer.cpp @@ -32,9 +32,11 @@ MultiplicationLayer* MultiplicationLayer::Clone(Graph& graph) const return CloneBase<MultiplicationLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void MultiplicationLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitMultiplicationLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/MultiplicationLayer.hpp b/src/armnn/layers/MultiplicationLayer.hpp index 692f40784c..8acf4f6d0d 100644 --- a/src/armnn/layers/MultiplicationLayer.hpp +++ b/src/armnn/layers/MultiplicationLayer.hpp @@ -24,7 +24,10 @@ public: /// @param [in] graph The graph into which this layer is being cloned. MultiplicationLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a MultiplicationLayer. diff --git a/src/armnn/layers/NormalizationLayer.cpp b/src/armnn/layers/NormalizationLayer.cpp index 4bf97edb72..bd38fa43b5 100644 --- a/src/armnn/layers/NormalizationLayer.cpp +++ b/src/armnn/layers/NormalizationLayer.cpp @@ -46,9 +46,11 @@ void NormalizationLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "NormalizationLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void NormalizationLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitNormalizationLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/NormalizationLayer.hpp b/src/armnn/layers/NormalizationLayer.hpp index 00a4435527..e36e8863a8 100644 --- a/src/armnn/layers/NormalizationLayer.hpp +++ b/src/armnn/layers/NormalizationLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a NormalizationLayer. diff --git a/src/armnn/layers/OutputLayer.cpp b/src/armnn/layers/OutputLayer.cpp index d14337fd11..579aede6b0 100644 --- a/src/armnn/layers/OutputLayer.cpp +++ b/src/armnn/layers/OutputLayer.cpp @@ -37,9 +37,11 @@ void OutputLayer::ValidateTensorShapesFromInputs() "OutputLayer: Input slot must be connected."); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void OutputLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitOutputLayer(this, GetBindingId(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/OutputLayer.hpp b/src/armnn/layers/OutputLayer.hpp index 408a28a6f3..d2bdf19ddd 100644 --- a/src/armnn/layers/OutputLayer.hpp +++ b/src/armnn/layers/OutputLayer.hpp @@ -40,7 +40,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create an OutputLayer. diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp index 2c53f20703..78af9d3c47 100644 --- a/src/armnn/layers/PadLayer.cpp +++ b/src/armnn/layers/PadLayer.cpp @@ -71,9 +71,11 @@ void PadLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "PadLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void PadLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitPadLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/PadLayer.hpp b/src/armnn/layers/PadLayer.hpp index 5664997597..9a31ae5d60 100644 --- a/src/armnn/layers/PadLayer.hpp +++ b/src/armnn/layers/PadLayer.hpp @@ -35,7 +35,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape> &inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a PadLayer. diff --git a/src/armnn/layers/PermuteLayer.cpp b/src/armnn/layers/PermuteLayer.cpp index 859e687cb3..1c563addf9 100644 --- a/src/armnn/layers/PermuteLayer.cpp +++ b/src/armnn/layers/PermuteLayer.cpp @@ -57,9 +57,11 @@ void PermuteLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "PermuteLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void PermuteLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitPermuteLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/PermuteLayer.hpp b/src/armnn/layers/PermuteLayer.hpp index 67be2e1939..db256b361b 100644 --- a/src/armnn/layers/PermuteLayer.hpp +++ b/src/armnn/layers/PermuteLayer.hpp @@ -60,7 +60,10 @@ public: GetPermutation().IsEqual(PolymorphicDowncast<const PermuteLayer*>(&other)->GetPermutation()); } + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a PermuteLayer. diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp index 0deafaacdd..d22bce2022 100644 --- a/src/armnn/layers/Pooling2dLayer.cpp +++ b/src/armnn/layers/Pooling2dLayer.cpp @@ -117,9 +117,11 @@ void Pooling2dLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "Pooling2dLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void Pooling2dLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitPooling2dLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/Pooling2dLayer.hpp b/src/armnn/layers/Pooling2dLayer.hpp index 90c9a44fbd..677c10b661 100644 --- a/src/armnn/layers/Pooling2dLayer.hpp +++ b/src/armnn/layers/Pooling2dLayer.hpp @@ -34,7 +34,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a Pooling2dLayer. diff --git a/src/armnn/layers/PreCompiledLayer.cpp b/src/armnn/layers/PreCompiledLayer.cpp index 67c1db4011..14dffe5e80 100644 --- a/src/armnn/layers/PreCompiledLayer.cpp +++ b/src/armnn/layers/PreCompiledLayer.cpp @@ -49,11 +49,13 @@ void PreCompiledLayer::SetPreCompiledObject(PreCompiledObjectPtr preCompiledObje m_PreCompiledObject = std::move(preCompiledObject); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void PreCompiledLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("PreCompiledLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END void PreCompiledLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/PreCompiledLayer.hpp b/src/armnn/layers/PreCompiledLayer.hpp index 0db1472413..e2c5e802fb 100644 --- a/src/armnn/layers/PreCompiledLayer.hpp +++ b/src/armnn/layers/PreCompiledLayer.hpp @@ -33,7 +33,10 @@ public: void SetPreCompiledObject(PreCompiledObjectPtr preCompiledObject); + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/PreluLayer.cpp b/src/armnn/layers/PreluLayer.cpp index 18d81ae9b6..9fb9f07f8c 100644 --- a/src/armnn/layers/PreluLayer.cpp +++ b/src/armnn/layers/PreluLayer.cpp @@ -116,9 +116,11 @@ void PreluLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "PreluLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void PreluLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitPreluLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/PreluLayer.hpp b/src/armnn/layers/PreluLayer.hpp index 511be29d17..eecffbcd22 100644 --- a/src/armnn/layers/PreluLayer.hpp +++ b/src/armnn/layers/PreluLayer.hpp @@ -35,7 +35,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a PreluLayer. diff --git a/src/armnn/layers/QLstmLayer.cpp b/src/armnn/layers/QLstmLayer.cpp index 0294afdc0d..493e3fe189 100644 --- a/src/armnn/layers/QLstmLayer.cpp +++ b/src/armnn/layers/QLstmLayer.cpp @@ -302,6 +302,7 @@ Layer::ConstantTensors QLstmLayer::GetConstantTensorsByRef() m_LayerNormParameters.m_OutputLayerNormWeights}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void QLstmLayer::Accept(ILayerVisitor& visitor) const { LstmInputParams inputParams; @@ -531,6 +532,7 @@ void QLstmLayer::Accept(ILayerVisitor& visitor) const visitor.VisitQLstmLayer(this, GetParameters(), inputParams, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void QLstmLayer::ExecuteStrategy(IStrategy& strategy) const diff --git a/src/armnn/layers/QLstmLayer.hpp b/src/armnn/layers/QLstmLayer.hpp index 38a0464da6..12774a935e 100644 --- a/src/armnn/layers/QLstmLayer.hpp +++ b/src/armnn/layers/QLstmLayer.hpp @@ -107,7 +107,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/QuantizeLayer.cpp b/src/armnn/layers/QuantizeLayer.cpp index 6ce28c4153..e37d6f5300 100644 --- a/src/armnn/layers/QuantizeLayer.cpp +++ b/src/armnn/layers/QuantizeLayer.cpp @@ -45,9 +45,11 @@ void QuantizeLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "QuantizeLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void QuantizeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitQuantizeLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } //namespace armnn
\ No newline at end of file diff --git a/src/armnn/layers/QuantizeLayer.hpp b/src/armnn/layers/QuantizeLayer.hpp index 2f331a493c..d8898ba1e9 100644 --- a/src/armnn/layers/QuantizeLayer.hpp +++ b/src/armnn/layers/QuantizeLayer.hpp @@ -23,7 +23,10 @@ public: void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: QuantizeLayer(const char* name); diff --git a/src/armnn/layers/QuantizedLstmLayer.cpp b/src/armnn/layers/QuantizedLstmLayer.cpp index be50f4863b..81642198fb 100644 --- a/src/armnn/layers/QuantizedLstmLayer.cpp +++ b/src/armnn/layers/QuantizedLstmLayer.cpp @@ -169,6 +169,7 @@ Layer::ConstantTensors QuantizedLstmLayer::GetConstantTensorsByRef() }; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void QuantizedLstmLayer::Accept(ILayerVisitor& visitor) const { QuantizedLstmInputParams inputParams; @@ -305,6 +306,7 @@ void QuantizedLstmLayer::Accept(ILayerVisitor& visitor) const visitor.VisitQuantizedLstmLayer(this, inputParams, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void QuantizedLstmLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/QuantizedLstmLayer.hpp b/src/armnn/layers/QuantizedLstmLayer.hpp index 25cc7b7d8b..fe7d423145 100644 --- a/src/armnn/layers/QuantizedLstmLayer.hpp +++ b/src/armnn/layers/QuantizedLstmLayer.hpp @@ -69,7 +69,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/RankLayer.cpp b/src/armnn/layers/RankLayer.cpp index 3b14ef0d93..a1e06efa11 100644 --- a/src/armnn/layers/RankLayer.cpp +++ b/src/armnn/layers/RankLayer.cpp @@ -41,10 +41,13 @@ void RankLayer::ValidateTensorShapesFromInputs() VerifyShapeInferenceType(outputShape, m_ShapeInferenceMethod); ValidateAndCopyShape(outputShape, inferredShape, m_ShapeInferenceMethod, "RankLayer"); } + +ARMNN_NO_DEPRECATE_WARN_BEGIN void RankLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitRankLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void RankLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/RankLayer.hpp b/src/armnn/layers/RankLayer.hpp index fbd2824bb5..416e1b0f6e 100644 --- a/src/armnn/layers/RankLayer.hpp +++ b/src/armnn/layers/RankLayer.hpp @@ -22,7 +22,10 @@ class RankLayer : public Layer void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/ReduceLayer.cpp b/src/armnn/layers/ReduceLayer.cpp index 31a2dfa479..07651fca67 100644 --- a/src/armnn/layers/ReduceLayer.cpp +++ b/src/armnn/layers/ReduceLayer.cpp @@ -102,9 +102,11 @@ void ReduceLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShape, m_ShapeInferenceMethod, "ReduceLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ReduceLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitReduceLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ReduceLayer.hpp b/src/armnn/layers/ReduceLayer.hpp index fd4f2073f1..a6ac44e69c 100644 --- a/src/armnn/layers/ReduceLayer.hpp +++ b/src/armnn/layers/ReduceLayer.hpp @@ -27,7 +27,10 @@ public: /// will lead to a valid configuration of @ref ReduceLayer. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a ReduceLayer. diff --git a/src/armnn/layers/ReshapeLayer.cpp b/src/armnn/layers/ReshapeLayer.cpp index f303ff7c68..1b9e691bcf 100644 --- a/src/armnn/layers/ReshapeLayer.cpp +++ b/src/armnn/layers/ReshapeLayer.cpp @@ -53,9 +53,11 @@ void ReshapeLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ReshapeLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ReshapeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitReshapeLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ReshapeLayer.hpp b/src/armnn/layers/ReshapeLayer.hpp index 78335e6a1a..d107b5cfc8 100644 --- a/src/armnn/layers/ReshapeLayer.hpp +++ b/src/armnn/layers/ReshapeLayer.hpp @@ -45,7 +45,10 @@ public: m_Param.m_TargetShape == PolymorphicDowncast<const ReshapeLayer*>(&other)->m_Param.m_TargetShape; } + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a ReshapeLayer. diff --git a/src/armnn/layers/ResizeLayer.cpp b/src/armnn/layers/ResizeLayer.cpp index 3a390d43cd..c190f494d1 100644 --- a/src/armnn/layers/ResizeLayer.cpp +++ b/src/armnn/layers/ResizeLayer.cpp @@ -75,9 +75,11 @@ void ResizeLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "ResizeLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ResizeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitResizeLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/ResizeLayer.hpp b/src/armnn/layers/ResizeLayer.hpp index 34625857f8..fab18c7716 100644 --- a/src/armnn/layers/ResizeLayer.hpp +++ b/src/armnn/layers/ResizeLayer.hpp @@ -34,7 +34,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a ResizeLayer. diff --git a/src/armnn/layers/RsqrtLayer.cpp b/src/armnn/layers/RsqrtLayer.cpp index 9c09701ab8..a0572da7c3 100644 --- a/src/armnn/layers/RsqrtLayer.cpp +++ b/src/armnn/layers/RsqrtLayer.cpp @@ -47,9 +47,11 @@ void RsqrtLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "RsqrtLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void RsqrtLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitRsqrtLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn
\ No newline at end of file diff --git a/src/armnn/layers/RsqrtLayer.hpp b/src/armnn/layers/RsqrtLayer.hpp index 4fcbf72120..a31aea6498 100644 --- a/src/armnn/layers/RsqrtLayer.hpp +++ b/src/armnn/layers/RsqrtLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create an RsqrtLayer. diff --git a/src/armnn/layers/ShapeLayer.cpp b/src/armnn/layers/ShapeLayer.cpp index 4193fa9aab..6a55a2d296 100644 --- a/src/armnn/layers/ShapeLayer.cpp +++ b/src/armnn/layers/ShapeLayer.cpp @@ -59,11 +59,13 @@ std::vector<TensorShape> ShapeLayer::InferOutputShapes(const std::vector<TensorS return std::vector<TensorShape>({ outputShape }); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void ShapeLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("ShapeLayer VisitShapeLayer is not implemented"); } +ARMNN_NO_DEPRECATE_WARN_END void ShapeLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/ShapeLayer.hpp b/src/armnn/layers/ShapeLayer.hpp index fee285c2f0..35ef873792 100644 --- a/src/armnn/layers/ShapeLayer.hpp +++ b/src/armnn/layers/ShapeLayer.hpp @@ -34,7 +34,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/SliceLayer.cpp b/src/armnn/layers/SliceLayer.cpp index b512ca4915..e7d8f1ed19 100644 --- a/src/armnn/layers/SliceLayer.cpp +++ b/src/armnn/layers/SliceLayer.cpp @@ -59,9 +59,11 @@ std::vector<TensorShape> SliceLayer::InferOutputShapes(const std::vector<TensorS return std::vector<TensorShape>({ outputShape }); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SliceLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSliceLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SliceLayer.hpp b/src/armnn/layers/SliceLayer.hpp index 0505a056c5..dda66a1be6 100644 --- a/src/armnn/layers/SliceLayer.hpp +++ b/src/armnn/layers/SliceLayer.hpp @@ -34,7 +34,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SliceLayer. diff --git a/src/armnn/layers/SoftmaxLayer.cpp b/src/armnn/layers/SoftmaxLayer.cpp index 9882da42b0..eab5b85e45 100644 --- a/src/armnn/layers/SoftmaxLayer.cpp +++ b/src/armnn/layers/SoftmaxLayer.cpp @@ -46,9 +46,11 @@ void SoftmaxLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "SoftmaxLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SoftmaxLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSoftmaxLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SoftmaxLayer.hpp b/src/armnn/layers/SoftmaxLayer.hpp index cbdd7c58f9..035e7bcf2d 100644 --- a/src/armnn/layers/SoftmaxLayer.hpp +++ b/src/armnn/layers/SoftmaxLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SoftmaxLayer. diff --git a/src/armnn/layers/SpaceToBatchNdLayer.cpp b/src/armnn/layers/SpaceToBatchNdLayer.cpp index b9e33314ef..3f58b3f6c9 100644 --- a/src/armnn/layers/SpaceToBatchNdLayer.cpp +++ b/src/armnn/layers/SpaceToBatchNdLayer.cpp @@ -83,9 +83,11 @@ void SpaceToBatchNdLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "SpaceToBatchNdLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SpaceToBatchNdLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSpaceToBatchNdLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace diff --git a/src/armnn/layers/SpaceToBatchNdLayer.hpp b/src/armnn/layers/SpaceToBatchNdLayer.hpp index 28857d8aba..70972bd8b3 100644 --- a/src/armnn/layers/SpaceToBatchNdLayer.hpp +++ b/src/armnn/layers/SpaceToBatchNdLayer.hpp @@ -35,7 +35,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SpaceToBatchNdLayer. diff --git a/src/armnn/layers/SpaceToDepthLayer.cpp b/src/armnn/layers/SpaceToDepthLayer.cpp index 90ba8fc8c3..1a3112c495 100644 --- a/src/armnn/layers/SpaceToDepthLayer.cpp +++ b/src/armnn/layers/SpaceToDepthLayer.cpp @@ -77,9 +77,11 @@ void SpaceToDepthLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "SpaceToDepthLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SpaceToDepthLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSpaceToDepthLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SpaceToDepthLayer.hpp b/src/armnn/layers/SpaceToDepthLayer.hpp index a8bc1089a3..267ac3b089 100644 --- a/src/armnn/layers/SpaceToDepthLayer.hpp +++ b/src/armnn/layers/SpaceToDepthLayer.hpp @@ -35,7 +35,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SpaceToDepthLayer. diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 5e6622e13a..c1e191c1a8 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -241,9 +241,11 @@ void SplitterLayer::ValidateTensorShapesFromInputs() } } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SplitterLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSplitterLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SplitterLayer.hpp b/src/armnn/layers/SplitterLayer.hpp index f90696b1ad..1fc37ef295 100644 --- a/src/armnn/layers/SplitterLayer.hpp +++ b/src/armnn/layers/SplitterLayer.hpp @@ -43,7 +43,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SplitterLayer. diff --git a/src/armnn/layers/StackLayer.cpp b/src/armnn/layers/StackLayer.cpp index 11935a1acf..fe2d123244 100644 --- a/src/armnn/layers/StackLayer.cpp +++ b/src/armnn/layers/StackLayer.cpp @@ -95,9 +95,11 @@ void StackLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "StackLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void StackLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitStackLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn armnn diff --git a/src/armnn/layers/StackLayer.hpp b/src/armnn/layers/StackLayer.hpp index 3d05da0bf6..8d38907de7 100644 --- a/src/armnn/layers/StackLayer.hpp +++ b/src/armnn/layers/StackLayer.hpp @@ -34,7 +34,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a StackLayer. diff --git a/src/armnn/layers/StandInLayer.cpp b/src/armnn/layers/StandInLayer.cpp index 6281f3e51e..ccf152921a 100644 --- a/src/armnn/layers/StandInLayer.cpp +++ b/src/armnn/layers/StandInLayer.cpp @@ -41,8 +41,10 @@ void StandInLayer::ValidateTensorShapesFromInputs() // so do nothing here. } +ARMNN_NO_DEPRECATE_WARN_BEGIN void StandInLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitStandInLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/StandInLayer.hpp b/src/armnn/layers/StandInLayer.hpp index 2864753efa..bb500065eb 100644 --- a/src/armnn/layers/StandInLayer.hpp +++ b/src/armnn/layers/StandInLayer.hpp @@ -37,7 +37,10 @@ public: /// Accepts a visitor object and calls VisitStandInLayer() method. /// @param visitor The visitor on which to call VisitStandInLayer() method. + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a StandInLayer. diff --git a/src/armnn/layers/StridedSliceLayer.cpp b/src/armnn/layers/StridedSliceLayer.cpp index c8f36355ae..aa7012c9a5 100644 --- a/src/armnn/layers/StridedSliceLayer.cpp +++ b/src/armnn/layers/StridedSliceLayer.cpp @@ -111,9 +111,11 @@ void StridedSliceLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "StridedSliceLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void StridedSliceLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitStridedSliceLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/StridedSliceLayer.hpp b/src/armnn/layers/StridedSliceLayer.hpp index 35ac3709da..7e17cb2e84 100644 --- a/src/armnn/layers/StridedSliceLayer.hpp +++ b/src/armnn/layers/StridedSliceLayer.hpp @@ -34,7 +34,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a StridedSliceLayer. diff --git a/src/armnn/layers/SubtractionLayer.cpp b/src/armnn/layers/SubtractionLayer.cpp index 34087bd466..bed708513e 100644 --- a/src/armnn/layers/SubtractionLayer.cpp +++ b/src/armnn/layers/SubtractionLayer.cpp @@ -32,9 +32,11 @@ SubtractionLayer* SubtractionLayer::Clone(Graph& graph) const return CloneBase<SubtractionLayer>(graph, GetName()); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SubtractionLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSubtractionLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SubtractionLayer.hpp b/src/armnn/layers/SubtractionLayer.hpp index 527b50bcad..8c31479c8e 100644 --- a/src/armnn/layers/SubtractionLayer.hpp +++ b/src/armnn/layers/SubtractionLayer.hpp @@ -24,7 +24,10 @@ public: /// @param [in] graph The graph into which this layer is being cloned. SubtractionLayer* Clone(Graph& graph) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SubtractionLayer. diff --git a/src/armnn/layers/SwitchLayer.cpp b/src/armnn/layers/SwitchLayer.cpp index 879263955f..258a7ffaec 100644 --- a/src/armnn/layers/SwitchLayer.cpp +++ b/src/armnn/layers/SwitchLayer.cpp @@ -52,9 +52,11 @@ void SwitchLayer::ValidateTensorShapesFromInputs() GetOutputSlot(1).GetTensorInfo().GetShape(), inferredShapes[1], m_ShapeInferenceMethod, "SwitchLayer", 1); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void SwitchLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitSwitchLayer(this, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/SwitchLayer.hpp b/src/armnn/layers/SwitchLayer.hpp index 025f379c99..a36261b51a 100644 --- a/src/armnn/layers/SwitchLayer.hpp +++ b/src/armnn/layers/SwitchLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a SwitchLayer. diff --git a/src/armnn/layers/TransposeConvolution2dLayer.cpp b/src/armnn/layers/TransposeConvolution2dLayer.cpp index c774dd0bbf..acdbebe802 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.cpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.cpp @@ -121,6 +121,7 @@ Layer::ConstantTensors TransposeConvolution2dLayer::GetConstantTensorsByRef() return {m_Weight, m_Bias}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void TransposeConvolution2dLayer::Accept(ILayerVisitor& visitor) const { ManagedConstTensorHandle managedWeight(m_Weight); @@ -136,6 +137,7 @@ void TransposeConvolution2dLayer::Accept(ILayerVisitor& visitor) const visitor.VisitTransposeConvolution2dLayer(this, GetParameters(), weightsTensor, optionalBiasTensor, GetName()); } +ARMNN_NO_DEPRECATE_WARN_END void TransposeConvolution2dLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/TransposeConvolution2dLayer.hpp b/src/armnn/layers/TransposeConvolution2dLayer.hpp index 1b17dac3c6..b6db41c2b7 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.hpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.hpp @@ -40,7 +40,10 @@ public: /// @return A vector of the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/TransposeLayer.cpp b/src/armnn/layers/TransposeLayer.cpp index 8951fe4637..ffd8693049 100644 --- a/src/armnn/layers/TransposeLayer.cpp +++ b/src/armnn/layers/TransposeLayer.cpp @@ -57,9 +57,11 @@ void TransposeLayer::ValidateTensorShapesFromInputs() ValidateAndCopyShape(outputShape, inferredShapes[0], m_ShapeInferenceMethod, "TransposeLayer"); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void TransposeLayer::Accept(ILayerVisitor& visitor) const { visitor.VisitTransposeLayer(this, GetParameters(), GetName()); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/TransposeLayer.hpp b/src/armnn/layers/TransposeLayer.hpp index a4245242ed..8449db4d9d 100644 --- a/src/armnn/layers/TransposeLayer.hpp +++ b/src/armnn/layers/TransposeLayer.hpp @@ -58,7 +58,10 @@ public: GetPermutation().IsEqual(PolymorphicDowncast<const TransposeLayer*>(&other)->GetPermutation()); } + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a TransposeLayer. diff --git a/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp b/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp index 45417069e4..a3671a0c42 100644 --- a/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp +++ b/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp @@ -307,11 +307,13 @@ Layer::ConstantTensors UnidirectionalSequenceLstmLayer::GetConstantTensorsByRef( m_LayerNormParameters.m_OutputLayerNormWeights}; } +ARMNN_NO_DEPRECATE_WARN_BEGIN void UnidirectionalSequenceLstmLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("UnidirectionalSequenceLstmLayer: VisitUnidirectionalSequenceLstmLayer is not implemented"); } +ARMNN_NO_DEPRECATE_WARN_END void UnidirectionalSequenceLstmLayer::ExecuteStrategy(IStrategy& strategy) const { diff --git a/src/armnn/layers/UnidirectionalSequenceLstmLayer.hpp b/src/armnn/layers/UnidirectionalSequenceLstmLayer.hpp index fb59f01ab6..857d2776a9 100644 --- a/src/armnn/layers/UnidirectionalSequenceLstmLayer.hpp +++ b/src/armnn/layers/UnidirectionalSequenceLstmLayer.hpp @@ -44,7 +44,10 @@ public: /// @return A vector to the inferred output shape. std::vector<TensorShape> InferOutputShapes(const std::vector<TensorShape>& inputShapes) const override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + void ExecuteStrategy(IStrategy& strategy) const override; diff --git a/src/armnn/layers/UnmapLayer.cpp b/src/armnn/layers/UnmapLayer.cpp index 4a43f9ff21..fa5dd9ebf2 100644 --- a/src/armnn/layers/UnmapLayer.cpp +++ b/src/armnn/layers/UnmapLayer.cpp @@ -41,10 +41,12 @@ void UnmapLayer::ValidateTensorShapesFromInputs() ARMNN_ASSERT(GetNumOutputSlots() == 0); } +ARMNN_NO_DEPRECATE_WARN_BEGIN void UnmapLayer::Accept(ILayerVisitor& visitor) const { IgnoreUnused(visitor); throw armnn::Exception("UnmapLayer should not appear in an input graph"); } +ARMNN_NO_DEPRECATE_WARN_END } // namespace armnn diff --git a/src/armnn/layers/UnmapLayer.hpp b/src/armnn/layers/UnmapLayer.hpp index 12d4342d62..3d1d11534e 100644 --- a/src/armnn/layers/UnmapLayer.hpp +++ b/src/armnn/layers/UnmapLayer.hpp @@ -28,7 +28,10 @@ public: /// @param [in] shapeInferenceMethod Indicates if output shape shall be overwritten or just validated. void ValidateTensorShapesFromInputs() override; + ARMNN_NO_DEPRECATE_WARN_BEGIN void Accept(ILayerVisitor& visitor) const override; + ARMNN_NO_DEPRECATE_WARN_END + protected: /// Constructor to create a UnmapLayer. |