diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2022-01-07 09:47:29 +0000 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2022-01-18 13:15:41 +0000 |
commit | 611c7fb97412230d5cefee047081455fb60db06c (patch) | |
tree | 1244050b50a300f67285aef00d8b05c52865b89a /src/armnn | |
parent | 53e06599a3af44db90c37d1cda34fc85ec9c27fa (diff) | |
download | armnn-611c7fb97412230d5cefee047081455fb60db06c.tar.gz |
IVGCVSW-6641 Stabilize the IWorkloadFactory interface with unified strategy
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ia941be9bf2c15fe56e49a9b9a2bbe943a8152438
Diffstat (limited to 'src/armnn')
66 files changed, 70 insertions, 74 deletions
diff --git a/src/armnn/layers/AbsLayer.cpp b/src/armnn/layers/AbsLayer.cpp index bc9e4f6d2a..13fa24aacf 100644 --- a/src/armnn/layers/AbsLayer.cpp +++ b/src/armnn/layers/AbsLayer.cpp @@ -21,10 +21,11 @@ AbsLayer::AbsLayer(const char* name) std::unique_ptr<IWorkload> AbsLayer::CreateWorkload(const IWorkloadFactory& factory) const { - AbsQueueDescriptor descriptor; + ElementwiseUnaryQueueDescriptor descriptor; + descriptor.m_Parameters.m_Operation = UnaryOperation::Abs; SetAdditionalInfo(descriptor); - return factory.CreateAbs(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ElementwiseUnary, descriptor, PrepInfoAndDesc(descriptor)); } AbsLayer* AbsLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ActivationLayer.cpp b/src/armnn/layers/ActivationLayer.cpp index 2cb1607204..63c98a93f6 100644 --- a/src/armnn/layers/ActivationLayer.cpp +++ b/src/armnn/layers/ActivationLayer.cpp @@ -22,7 +22,7 @@ std::unique_ptr<IWorkload> ActivationLayer::CreateWorkload(const IWorkloadFactor ActivationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateActivation(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Activation, descriptor, PrepInfoAndDesc(descriptor)); } ActivationLayer* ActivationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/AdditionLayer.cpp b/src/armnn/layers/AdditionLayer.cpp index c3e98a13ca..f55bb55edd 100644 --- a/src/armnn/layers/AdditionLayer.cpp +++ b/src/armnn/layers/AdditionLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> AdditionLayer::CreateWorkload(const IWorkloadFactory& AdditionQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateAddition(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Addition, descriptor, PrepInfoAndDesc(descriptor)); } AdditionLayer* AdditionLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ArgMinMaxLayer.cpp b/src/armnn/layers/ArgMinMaxLayer.cpp index dc69ef6a41..30db7ba803 100644 --- a/src/armnn/layers/ArgMinMaxLayer.cpp +++ b/src/armnn/layers/ArgMinMaxLayer.cpp @@ -26,7 +26,7 @@ std::unique_ptr<IWorkload> ArgMinMaxLayer::CreateWorkload(const IWorkloadFactory ArgMinMaxQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateArgMinMax(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ArgMinMax, descriptor, PrepInfoAndDesc(descriptor)); } ArgMinMaxLayer* ArgMinMaxLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/BatchNormalizationLayer.cpp b/src/armnn/layers/BatchNormalizationLayer.cpp index e830b186b8..18d167f8cb 100644 --- a/src/armnn/layers/BatchNormalizationLayer.cpp +++ b/src/armnn/layers/BatchNormalizationLayer.cpp @@ -34,7 +34,7 @@ std::unique_ptr<IWorkload> BatchNormalizationLayer::CreateWorkload(const IWorklo descriptor.m_Beta = m_Beta.get(); descriptor.m_Gamma = m_Gamma.get(); - return factory.CreateBatchNormalization(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::BatchNormalization, descriptor, PrepInfoAndDesc(descriptor)); } BatchNormalizationLayer* BatchNormalizationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/BatchToSpaceNdLayer.cpp b/src/armnn/layers/BatchToSpaceNdLayer.cpp index ce602ad08f..485500d87d 100644 --- a/src/armnn/layers/BatchToSpaceNdLayer.cpp +++ b/src/armnn/layers/BatchToSpaceNdLayer.cpp @@ -33,7 +33,7 @@ std::unique_ptr<IWorkload> BatchToSpaceNdLayer::CreateWorkload(const IWorkloadFa BatchToSpaceNdQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateBatchToSpaceNd(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::BatchToSpaceNd, descriptor, PrepInfoAndDesc(descriptor)); } BatchToSpaceNdLayer* BatchToSpaceNdLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/CastLayer.cpp b/src/armnn/layers/CastLayer.cpp index c5cecb4f74..03b68659d1 100644 --- a/src/armnn/layers/CastLayer.cpp +++ b/src/armnn/layers/CastLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> CastLayer::CreateWorkload(const IWorkloadFactory& fac CastQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateCast(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Cast, descriptor, PrepInfoAndDesc(descriptor)); } CastLayer* CastLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ChannelShuffleLayer.cpp b/src/armnn/layers/ChannelShuffleLayer.cpp index 5f4729ff51..78a2393a52 100644 --- a/src/armnn/layers/ChannelShuffleLayer.cpp +++ b/src/armnn/layers/ChannelShuffleLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ChannelShuffleLayer::CreateWorkload(const IWorkloadFa ChannelShuffleQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateChannelShuffle(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ChannelShuffle, descriptor, PrepInfoAndDesc(descriptor)); } ChannelShuffleLayer* ChannelShuffleLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ComparisonLayer.cpp b/src/armnn/layers/ComparisonLayer.cpp index 47430f1766..cf16386f6e 100644 --- a/src/armnn/layers/ComparisonLayer.cpp +++ b/src/armnn/layers/ComparisonLayer.cpp @@ -25,7 +25,7 @@ std::unique_ptr<IWorkload> ComparisonLayer::CreateWorkload(const IWorkloadFactor ComparisonQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateComparison(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Comparison,descriptor, PrepInfoAndDesc(descriptor)); } ComparisonLayer* ComparisonLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ConcatLayer.cpp b/src/armnn/layers/ConcatLayer.cpp index 98cb585322..b59e0b9a57 100644 --- a/src/armnn/layers/ConcatLayer.cpp +++ b/src/armnn/layers/ConcatLayer.cpp @@ -33,7 +33,7 @@ std::unique_ptr<IWorkload> ConcatLayer::CreateWorkload(const IWorkloadFactory& f } SetAdditionalInfo(descriptor); - return factory.CreateConcat(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Concat, descriptor, PrepInfoAndDesc(descriptor)); } template<typename FactoryType> diff --git a/src/armnn/layers/ConstantLayer.cpp b/src/armnn/layers/ConstantLayer.cpp index 0ab92cc2fb..0c06dd5a54 100644 --- a/src/armnn/layers/ConstantLayer.cpp +++ b/src/armnn/layers/ConstantLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ConstantLayer::CreateWorkload(const IWorkloadFactory& descriptor.m_LayerOutput = m_LayerOutput.get(); SetAdditionalInfo(descriptor); - return factory.CreateConstant(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Constant, descriptor, PrepInfoAndDesc(descriptor)); } ConstantLayer* ConstantLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp index e589008bd4..6d843f3129 100644 --- a/src/armnn/layers/ConvertBf16ToFp32Layer.cpp +++ b/src/armnn/layers/ConvertBf16ToFp32Layer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ConvertBf16ToFp32Layer::CreateWorkload(const IWorkloa ConvertBf16ToFp32QueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateConvertBf16ToFp32(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ConvertBf16ToFp32, descriptor, PrepInfoAndDesc(descriptor)); } ConvertBf16ToFp32Layer* ConvertBf16ToFp32Layer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp index 656f59f192..cc3c8b18e1 100644 --- a/src/armnn/layers/ConvertFp16ToFp32Layer.cpp +++ b/src/armnn/layers/ConvertFp16ToFp32Layer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ConvertFp16ToFp32Layer::CreateWorkload(const IWorkloa ConvertFp16ToFp32QueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateConvertFp16ToFp32(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ConvertFp16ToFp32, descriptor, PrepInfoAndDesc(descriptor)); } ConvertFp16ToFp32Layer* ConvertFp16ToFp32Layer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp index b2f4eb11d0..978fbd16da 100644 --- a/src/armnn/layers/ConvertFp32ToBf16Layer.cpp +++ b/src/armnn/layers/ConvertFp32ToBf16Layer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ConvertFp32ToBf16Layer::CreateWorkload(const IWorkloa ConvertFp32ToBf16QueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateConvertFp32ToBf16(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ConvertFp32ToBf16, descriptor, PrepInfoAndDesc(descriptor)); } ConvertFp32ToBf16Layer* ConvertFp32ToBf16Layer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp index f5a8b01a23..2e1074a1b4 100644 --- a/src/armnn/layers/ConvertFp32ToFp16Layer.cpp +++ b/src/armnn/layers/ConvertFp32ToFp16Layer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> ConvertFp32ToFp16Layer::CreateWorkload(const IWorkloa ConvertFp32ToFp16QueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateConvertFp32ToFp16(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ConvertFp32ToFp16, descriptor, PrepInfoAndDesc(descriptor)); } ConvertFp32ToFp16Layer* ConvertFp32ToFp16Layer::Clone(Graph& graph) const diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index 1c60f17b96..68e1cb5339 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -63,7 +63,7 @@ std::unique_ptr<IWorkload> Convolution2dLayer::CreateWorkload(const IWorkloadFac SetAdditionalInfo(descriptor); - return factory.CreateConvolution2d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Convolution2d, descriptor, PrepInfoAndDesc(descriptor)); } Convolution2dLayer* Convolution2dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/Convolution3dLayer.cpp b/src/armnn/layers/Convolution3dLayer.cpp index cc33eae613..42b275e055 100644 --- a/src/armnn/layers/Convolution3dLayer.cpp +++ b/src/armnn/layers/Convolution3dLayer.cpp @@ -50,7 +50,7 @@ std::unique_ptr<IWorkload> Convolution3dLayer::CreateWorkload(const IWorkloadFac Convolution3dQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateConvolution3d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Convolution3d, descriptor, PrepInfoAndDesc(descriptor)); } Convolution3dLayer* Convolution3dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DebugLayer.cpp b/src/armnn/layers/DebugLayer.cpp index 96538feb93..90a55cbc40 100644 --- a/src/armnn/layers/DebugLayer.cpp +++ b/src/armnn/layers/DebugLayer.cpp @@ -28,7 +28,7 @@ std::unique_ptr<IWorkload> DebugLayer::CreateWorkload(const IWorkloadFactory& fa SetAdditionalInfo(descriptor); - return factory.CreateDebug(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Debug, descriptor, PrepInfoAndDesc(descriptor)); } DebugLayer* DebugLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DepthToSpaceLayer.cpp b/src/armnn/layers/DepthToSpaceLayer.cpp index 05d691e0d6..033154e81d 100644 --- a/src/armnn/layers/DepthToSpaceLayer.cpp +++ b/src/armnn/layers/DepthToSpaceLayer.cpp @@ -30,7 +30,7 @@ std::unique_ptr<IWorkload> DepthToSpaceLayer::CreateWorkload(const IWorkloadFact SetAdditionalInfo(descriptor); - return factory.CreateDepthToSpace(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::DepthToSpace, descriptor, PrepInfoAndDesc(descriptor)); } DepthToSpaceLayer* DepthToSpaceLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index b1b95faa4f..db14e22b29 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -65,7 +65,7 @@ std::unique_ptr<IWorkload> DepthwiseConvolution2dLayer::CreateWorkload(const IWo SetAdditionalInfo(descriptor); - return factory.CreateDepthwiseConvolution2d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::DepthwiseConvolution2d, descriptor, PrepInfoAndDesc(descriptor)); } DepthwiseConvolution2dLayer* DepthwiseConvolution2dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DequantizeLayer.cpp b/src/armnn/layers/DequantizeLayer.cpp index 84c90104d0..afa0a7382a 100644 --- a/src/armnn/layers/DequantizeLayer.cpp +++ b/src/armnn/layers/DequantizeLayer.cpp @@ -22,7 +22,7 @@ std::unique_ptr<IWorkload> DequantizeLayer::CreateWorkload( DequantizeQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateDequantize(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Dequantize, descriptor, PrepInfoAndDesc(descriptor)); } DequantizeLayer* DequantizeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DetectionPostProcessLayer.cpp b/src/armnn/layers/DetectionPostProcessLayer.cpp index 5a7d888457..833ef43597 100644 --- a/src/armnn/layers/DetectionPostProcessLayer.cpp +++ b/src/armnn/layers/DetectionPostProcessLayer.cpp @@ -26,7 +26,7 @@ std::unique_ptr<IWorkload> DetectionPostProcessLayer::CreateWorkload(const armnn descriptor.m_Anchors = m_Anchors.get(); SetAdditionalInfo(descriptor); - return factory.CreateDetectionPostProcess(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::DetectionPostProcess, descriptor, PrepInfoAndDesc(descriptor)); } DetectionPostProcessLayer* DetectionPostProcessLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/DivisionLayer.cpp b/src/armnn/layers/DivisionLayer.cpp index c65e191f04..c6faf41a84 100644 --- a/src/armnn/layers/DivisionLayer.cpp +++ b/src/armnn/layers/DivisionLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> DivisionLayer::CreateWorkload(const IWorkloadFactory& DivisionQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateDivision(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Division, descriptor, PrepInfoAndDesc(descriptor)); } DivisionLayer* DivisionLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ElementwiseUnaryLayer.cpp b/src/armnn/layers/ElementwiseUnaryLayer.cpp index 37d6084d5b..c50910bd32 100644 --- a/src/armnn/layers/ElementwiseUnaryLayer.cpp +++ b/src/armnn/layers/ElementwiseUnaryLayer.cpp @@ -23,13 +23,7 @@ ElementwiseUnaryLayer::ElementwiseUnaryLayer(const ElementwiseUnaryDescriptor& p std::unique_ptr<IWorkload> ElementwiseUnaryLayer::CreateWorkload(const IWorkloadFactory& factory) const { ElementwiseUnaryQueueDescriptor descriptor; - - if (descriptor.m_Parameters.m_Operation == UnaryOperation::LogicalNot) - { - return factory.CreateLogicalUnary(descriptor, PrepInfoAndDesc(descriptor)); - } - - return factory.CreateElementwiseUnary(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ElementwiseUnary, descriptor, PrepInfoAndDesc(descriptor)); } ElementwiseUnaryLayer* ElementwiseUnaryLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/FakeQuantizationLayer.cpp b/src/armnn/layers/FakeQuantizationLayer.cpp index 453891fa60..f375f9af43 100644 --- a/src/armnn/layers/FakeQuantizationLayer.cpp +++ b/src/armnn/layers/FakeQuantizationLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> FakeQuantizationLayer::CreateWorkload(const IWorkload FakeQuantizationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateFakeQuantization(descriptor, PrepInfoAndDesc(descriptor) ); + return factory.CreateWorkload(LayerType::FakeQuantization, descriptor, PrepInfoAndDesc(descriptor) ); } FakeQuantizationLayer* FakeQuantizationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/FillLayer.cpp b/src/armnn/layers/FillLayer.cpp index 9fb1bdaeaf..5004fabedf 100644 --- a/src/armnn/layers/FillLayer.cpp +++ b/src/armnn/layers/FillLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> FillLayer::CreateWorkload(const IWorkloadFactory& fac FillQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateFill(descriptor, PrepInfoAndDesc(descriptor) ); + return factory.CreateWorkload(LayerType::Fill, descriptor, PrepInfoAndDesc(descriptor) ); } FillLayer* FillLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/FloorLayer.cpp b/src/armnn/layers/FloorLayer.cpp index 5dbbc28ac3..616c118552 100644 --- a/src/armnn/layers/FloorLayer.cpp +++ b/src/armnn/layers/FloorLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> FloorLayer::CreateWorkload(const IWorkloadFactory& fa FloorQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateFloor(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Floor, descriptor, PrepInfoAndDesc(descriptor)); } FloorLayer* FloorLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/FullyConnectedLayer.cpp b/src/armnn/layers/FullyConnectedLayer.cpp index 261932a15c..6a9c3b07e4 100644 --- a/src/armnn/layers/FullyConnectedLayer.cpp +++ b/src/armnn/layers/FullyConnectedLayer.cpp @@ -32,7 +32,7 @@ std::unique_ptr<IWorkload> FullyConnectedLayer::CreateWorkload(const IWorkloadFa } SetAdditionalInfo(descriptor); - return factory.CreateFullyConnected(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::FullyConnected, descriptor, PrepInfoAndDesc(descriptor)); } FullyConnectedLayer* FullyConnectedLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/GatherLayer.cpp b/src/armnn/layers/GatherLayer.cpp index 9b34c12a4b..33d2088e69 100644 --- a/src/armnn/layers/GatherLayer.cpp +++ b/src/armnn/layers/GatherLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> GatherLayer::CreateWorkload(const armnn::IWorkloadFac GatherQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateGather(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Gather, descriptor, PrepInfoAndDesc(descriptor)); } GatherLayer* GatherLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/InstanceNormalizationLayer.cpp b/src/armnn/layers/InstanceNormalizationLayer.cpp index 6d06c36404..44e98700c9 100644 --- a/src/armnn/layers/InstanceNormalizationLayer.cpp +++ b/src/armnn/layers/InstanceNormalizationLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> InstanceNormalizationLayer::CreateWorkload(const IWor InstanceNormalizationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateInstanceNormalization(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::InstanceNormalization, descriptor, PrepInfoAndDesc(descriptor)); } InstanceNormalizationLayer* InstanceNormalizationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/L2NormalizationLayer.cpp b/src/armnn/layers/L2NormalizationLayer.cpp index 7a01b073bf..0e0ae2e66f 100644 --- a/src/armnn/layers/L2NormalizationLayer.cpp +++ b/src/armnn/layers/L2NormalizationLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> L2NormalizationLayer::CreateWorkload(const IWorkloadF L2NormalizationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateL2Normalization(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::L2Normalization, descriptor, PrepInfoAndDesc(descriptor)); } L2NormalizationLayer* L2NormalizationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/LogSoftmaxLayer.cpp b/src/armnn/layers/LogSoftmaxLayer.cpp index e3632025a3..4f51a2baf8 100644 --- a/src/armnn/layers/LogSoftmaxLayer.cpp +++ b/src/armnn/layers/LogSoftmaxLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> LogSoftmaxLayer::CreateWorkload(const IWorkloadFactor LogSoftmaxQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateLogSoftmax(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::LogSoftmax, descriptor, PrepInfoAndDesc(descriptor)); } LogSoftmaxLayer* LogSoftmaxLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/LogicalBinaryLayer.cpp b/src/armnn/layers/LogicalBinaryLayer.cpp index cc0ed24827..1a20c988a4 100644 --- a/src/armnn/layers/LogicalBinaryLayer.cpp +++ b/src/armnn/layers/LogicalBinaryLayer.cpp @@ -23,7 +23,7 @@ LogicalBinaryLayer::LogicalBinaryLayer(const LogicalBinaryDescriptor& param, con std::unique_ptr<IWorkload> LogicalBinaryLayer::CreateWorkload(const IWorkloadFactory& factory) const { LogicalBinaryQueueDescriptor descriptor; - return factory.CreateLogicalBinary(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::LogicalBinary, descriptor, PrepInfoAndDesc(descriptor)); } LogicalBinaryLayer* LogicalBinaryLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/LstmLayer.cpp b/src/armnn/layers/LstmLayer.cpp index 44da98687a..46c7574cf8 100644 --- a/src/armnn/layers/LstmLayer.cpp +++ b/src/armnn/layers/LstmLayer.cpp @@ -74,7 +74,7 @@ std::unique_ptr<IWorkload> LstmLayer::CreateWorkload(const IWorkloadFactory& fac SetAdditionalInfo(descriptor); - return factory.CreateLstm(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Lstm, descriptor, PrepInfoAndDesc(descriptor)); } LstmLayer* LstmLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/MaximumLayer.cpp b/src/armnn/layers/MaximumLayer.cpp index 077f83f34d..438c9be116 100644 --- a/src/armnn/layers/MaximumLayer.cpp +++ b/src/armnn/layers/MaximumLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> MaximumLayer::CreateWorkload(const IWorkloadFactory& MaximumQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateMaximum(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Maximum, descriptor, PrepInfoAndDesc(descriptor)); } MaximumLayer* MaximumLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/MeanLayer.cpp b/src/armnn/layers/MeanLayer.cpp index b56905fe99..f695cc3735 100644 --- a/src/armnn/layers/MeanLayer.cpp +++ b/src/armnn/layers/MeanLayer.cpp @@ -28,7 +28,7 @@ std::unique_ptr<IWorkload> MeanLayer::CreateWorkload(const armnn::IWorkloadFacto descriptor.m_Parameters.m_KeepDims = m_Param.m_KeepDims; SetAdditionalInfo(descriptor); - return factory.CreateMean(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Mean, descriptor, PrepInfoAndDesc(descriptor)); } MeanLayer* MeanLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/MinimumLayer.cpp b/src/armnn/layers/MinimumLayer.cpp index 43715acc14..894704132a 100644 --- a/src/armnn/layers/MinimumLayer.cpp +++ b/src/armnn/layers/MinimumLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> MinimumLayer::CreateWorkload(const IWorkloadFactory& MinimumQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateMinimum(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Minimum, descriptor, PrepInfoAndDesc(descriptor)); } MinimumLayer* MinimumLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/MultiplicationLayer.cpp b/src/armnn/layers/MultiplicationLayer.cpp index 05e266c793..36f2689506 100644 --- a/src/armnn/layers/MultiplicationLayer.cpp +++ b/src/armnn/layers/MultiplicationLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> MultiplicationLayer::CreateWorkload(const IWorkloadFa MultiplicationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateMultiplication(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Multiplication, descriptor, PrepInfoAndDesc(descriptor)); } MultiplicationLayer* MultiplicationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/NormalizationLayer.cpp b/src/armnn/layers/NormalizationLayer.cpp index e7b6de5de4..e42a7cf28e 100644 --- a/src/armnn/layers/NormalizationLayer.cpp +++ b/src/armnn/layers/NormalizationLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> NormalizationLayer::CreateWorkload(const IWorkloadFac NormalizationQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateNormalization(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Normalization, descriptor, PrepInfoAndDesc(descriptor)); } NormalizationLayer* NormalizationLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/PadLayer.cpp b/src/armnn/layers/PadLayer.cpp index 667270a948..7900fa5a97 100644 --- a/src/armnn/layers/PadLayer.cpp +++ b/src/armnn/layers/PadLayer.cpp @@ -26,7 +26,7 @@ std::unique_ptr<IWorkload> PadLayer::CreateWorkload(const armnn::IWorkloadFactor descriptor.m_Parameters.m_PaddingMode = m_Param.m_PaddingMode; SetAdditionalInfo(descriptor); - return factory.CreatePad(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Pad, descriptor, PrepInfoAndDesc(descriptor)); } PadLayer* PadLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/PermuteLayer.cpp b/src/armnn/layers/PermuteLayer.cpp index 1a4d87b19a..e20eea6815 100644 --- a/src/armnn/layers/PermuteLayer.cpp +++ b/src/armnn/layers/PermuteLayer.cpp @@ -27,7 +27,7 @@ std::unique_ptr<IWorkload> PermuteLayer::CreateWorkload(const IWorkloadFactory& PermuteQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreatePermute(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Permute, descriptor, PrepInfoAndDesc(descriptor)); } PermuteLayer* PermuteLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/Pooling2dLayer.cpp b/src/armnn/layers/Pooling2dLayer.cpp index ce58012493..9fb055b27d 100644 --- a/src/armnn/layers/Pooling2dLayer.cpp +++ b/src/armnn/layers/Pooling2dLayer.cpp @@ -29,7 +29,7 @@ std::unique_ptr<IWorkload> Pooling2dLayer::CreateWorkload(const IWorkloadFactory Pooling2dQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreatePooling2d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Pooling2d, descriptor, PrepInfoAndDesc(descriptor)); } Pooling2dLayer* Pooling2dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/Pooling3dLayer.cpp b/src/armnn/layers/Pooling3dLayer.cpp index 4c083f337c..046e146423 100644 --- a/src/armnn/layers/Pooling3dLayer.cpp +++ b/src/armnn/layers/Pooling3dLayer.cpp @@ -29,7 +29,7 @@ std::unique_ptr<IWorkload> Pooling3dLayer::CreateWorkload(const IWorkloadFactory Pooling3dQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreatePooling3d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Pooling3d, descriptor, PrepInfoAndDesc(descriptor)); } Pooling3dLayer* Pooling3dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/PreCompiledLayer.cpp b/src/armnn/layers/PreCompiledLayer.cpp index 80320e3ba2..ff2fa322e7 100644 --- a/src/armnn/layers/PreCompiledLayer.cpp +++ b/src/armnn/layers/PreCompiledLayer.cpp @@ -34,7 +34,7 @@ std::unique_ptr<IWorkload> PreCompiledLayer::CreateWorkload(const armnn::IWorklo descriptor.m_PreCompiledObject = m_PreCompiledObject.get(); SetAdditionalInfo(descriptor); - return factory.CreatePreCompiled(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::PreCompiled, descriptor, PrepInfoAndDesc(descriptor)); } void PreCompiledLayer::ValidateTensorShapesFromInputs() diff --git a/src/armnn/layers/PreluLayer.cpp b/src/armnn/layers/PreluLayer.cpp index 8d88ed4829..431e2f4e38 100644 --- a/src/armnn/layers/PreluLayer.cpp +++ b/src/armnn/layers/PreluLayer.cpp @@ -25,7 +25,7 @@ std::unique_ptr<IWorkload> PreluLayer::CreateWorkload(const IWorkloadFactory& fa PreluQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreatePrelu(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Prelu, descriptor, PrepInfoAndDesc(descriptor)); } PreluLayer* PreluLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/QLstmLayer.cpp b/src/armnn/layers/QLstmLayer.cpp index a09aaeeb95..17031fa112 100644 --- a/src/armnn/layers/QLstmLayer.cpp +++ b/src/armnn/layers/QLstmLayer.cpp @@ -75,7 +75,7 @@ std::unique_ptr<IWorkload> QLstmLayer::CreateWorkload(const IWorkloadFactory& fa SetAdditionalInfo(descriptor); - return factory.CreateQLstm(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::QLstm, descriptor, PrepInfoAndDesc(descriptor)); } QLstmLayer* QLstmLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/QuantizeLayer.cpp b/src/armnn/layers/QuantizeLayer.cpp index e37d6f5300..55f23bf251 100644 --- a/src/armnn/layers/QuantizeLayer.cpp +++ b/src/armnn/layers/QuantizeLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> QuantizeLayer::CreateWorkload(const IWorkloadFactory& WorkloadInfo info = PrepInfoAndDesc(descriptor); - return factory.CreateQuantize(descriptor, info); + return factory.CreateWorkload(LayerType::Quantize, descriptor, info); } Layer* QuantizeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/QuantizedLstmLayer.cpp b/src/armnn/layers/QuantizedLstmLayer.cpp index 6a09241645..7fd39f14b1 100644 --- a/src/armnn/layers/QuantizedLstmLayer.cpp +++ b/src/armnn/layers/QuantizedLstmLayer.cpp @@ -41,7 +41,7 @@ std::unique_ptr<IWorkload> QuantizedLstmLayer::CreateWorkload(const IWorkloadFac SetAdditionalInfo(descriptor); - return factory.CreateQuantizedLstm(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::QuantizedLstm, descriptor, PrepInfoAndDesc(descriptor)); } QuantizedLstmLayer* QuantizedLstmLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/RankLayer.cpp b/src/armnn/layers/RankLayer.cpp index 17ca691c51..84d25bf756 100644 --- a/src/armnn/layers/RankLayer.cpp +++ b/src/armnn/layers/RankLayer.cpp @@ -22,7 +22,7 @@ std::unique_ptr<IWorkload> RankLayer::CreateWorkload(const IWorkloadFactory& fac RankQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateRank(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Rank, descriptor, PrepInfoAndDesc(descriptor)); } Layer* RankLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ReduceLayer.cpp b/src/armnn/layers/ReduceLayer.cpp index b03ac72e50..1f4387b58c 100644 --- a/src/armnn/layers/ReduceLayer.cpp +++ b/src/armnn/layers/ReduceLayer.cpp @@ -27,7 +27,7 @@ std::unique_ptr<IWorkload> ReduceLayer::CreateWorkload(const IWorkloadFactory& f descriptor.m_Parameters.m_ReduceOperation = m_Param.m_ReduceOperation; SetAdditionalInfo(descriptor); - return factory.CreateReduce(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Reduce, descriptor, PrepInfoAndDesc(descriptor)); } ReduceLayer* ReduceLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ReshapeLayer.cpp b/src/armnn/layers/ReshapeLayer.cpp index 571013d2e6..b194f7a48d 100644 --- a/src/armnn/layers/ReshapeLayer.cpp +++ b/src/armnn/layers/ReshapeLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> ReshapeLayer::CreateWorkload(const IWorkloadFactory& ReshapeQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateReshape(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Reshape, descriptor, PrepInfoAndDesc(descriptor)); } ReshapeLayer* ReshapeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ResizeLayer.cpp b/src/armnn/layers/ResizeLayer.cpp index 9c407c1af5..89a94f78d3 100644 --- a/src/armnn/layers/ResizeLayer.cpp +++ b/src/armnn/layers/ResizeLayer.cpp @@ -28,7 +28,7 @@ std::unique_ptr<IWorkload> ResizeLayer::CreateWorkload(const IWorkloadFactory& f ResizeQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateResize(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Resize, descriptor, PrepInfoAndDesc(descriptor)); } ResizeLayer* ResizeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/RsqrtLayer.cpp b/src/armnn/layers/RsqrtLayer.cpp index adac012173..3a63b7c502 100644 --- a/src/armnn/layers/RsqrtLayer.cpp +++ b/src/armnn/layers/RsqrtLayer.cpp @@ -21,10 +21,11 @@ RsqrtLayer::RsqrtLayer(const char* name) std::unique_ptr<IWorkload> RsqrtLayer::CreateWorkload(const IWorkloadFactory& factory) const { - RsqrtQueueDescriptor descriptor; + ElementwiseUnaryQueueDescriptor descriptor; + descriptor.m_Parameters.m_Operation = UnaryOperation::Rsqrt; SetAdditionalInfo(descriptor); - return factory.CreateRsqrt(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::ElementwiseUnary, descriptor, PrepInfoAndDesc(descriptor)); } RsqrtLayer* RsqrtLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/ShapeLayer.cpp b/src/armnn/layers/ShapeLayer.cpp index 318f38c5a2..ecc112c02e 100644 --- a/src/armnn/layers/ShapeLayer.cpp +++ b/src/armnn/layers/ShapeLayer.cpp @@ -26,7 +26,7 @@ std::unique_ptr<IWorkload> ShapeLayer::CreateWorkload(const IWorkloadFactory& fa ShapeQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateShape(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Shape, descriptor, PrepInfoAndDesc(descriptor)); } ShapeLayer* ShapeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SliceLayer.cpp b/src/armnn/layers/SliceLayer.cpp index c87cab342b..0d61181c5d 100644 --- a/src/armnn/layers/SliceLayer.cpp +++ b/src/armnn/layers/SliceLayer.cpp @@ -26,7 +26,7 @@ std::unique_ptr<IWorkload> SliceLayer::CreateWorkload(const IWorkloadFactory& fa SliceQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateSlice(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Slice, descriptor, PrepInfoAndDesc(descriptor)); } SliceLayer* SliceLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SoftmaxLayer.cpp b/src/armnn/layers/SoftmaxLayer.cpp index 3a6dfc4958..a2930e6035 100644 --- a/src/armnn/layers/SoftmaxLayer.cpp +++ b/src/armnn/layers/SoftmaxLayer.cpp @@ -23,7 +23,7 @@ std::unique_ptr<IWorkload> SoftmaxLayer::CreateWorkload(const IWorkloadFactory& SoftmaxQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateSoftmax(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Softmax, descriptor, PrepInfoAndDesc(descriptor)); } SoftmaxLayer* SoftmaxLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SpaceToBatchNdLayer.cpp b/src/armnn/layers/SpaceToBatchNdLayer.cpp index e801925f58..a4c6d1b237 100644 --- a/src/armnn/layers/SpaceToBatchNdLayer.cpp +++ b/src/armnn/layers/SpaceToBatchNdLayer.cpp @@ -31,7 +31,7 @@ std::unique_ptr<IWorkload> SpaceToBatchNdLayer::CreateWorkload(const IWorkloadFa descriptor.m_Parameters.m_PadList = m_Param.m_PadList; SetAdditionalInfo(descriptor); - return factory.CreateSpaceToBatchNd(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::SpaceToBatchNd, descriptor, PrepInfoAndDesc(descriptor)); } SpaceToBatchNdLayer* SpaceToBatchNdLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SpaceToDepthLayer.cpp b/src/armnn/layers/SpaceToDepthLayer.cpp index 612d940615..51d79f4d03 100644 --- a/src/armnn/layers/SpaceToDepthLayer.cpp +++ b/src/armnn/layers/SpaceToDepthLayer.cpp @@ -32,7 +32,7 @@ std::unique_ptr<IWorkload> SpaceToDepthLayer::CreateWorkload(const IWorkloadFact SetAdditionalInfo(descriptor); - return factory.CreateSpaceToDepth(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::SpaceToDepth, descriptor, PrepInfoAndDesc(descriptor)); } SpaceToDepthLayer* SpaceToDepthLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp index 5e658cebb3..42cb6e1950 100644 --- a/src/armnn/layers/SplitterLayer.cpp +++ b/src/armnn/layers/SplitterLayer.cpp @@ -31,7 +31,7 @@ std::unique_ptr<IWorkload> SplitterLayer::CreateWorkload(const IWorkloadFactory& SetAdditionalInfo(descriptor); - return factory.CreateSplitter(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Splitter, descriptor, PrepInfoAndDesc(descriptor)); } template<typename FactoryType> diff --git a/src/armnn/layers/StackLayer.cpp b/src/armnn/layers/StackLayer.cpp index 09f255bb2e..b842f1b4d5 100644 --- a/src/armnn/layers/StackLayer.cpp +++ b/src/armnn/layers/StackLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> StackLayer::CreateWorkload(const IWorkloadFactory& fa StackQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateStack(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Stack, descriptor, PrepInfoAndDesc(descriptor)); } StackLayer* StackLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/StridedSliceLayer.cpp b/src/armnn/layers/StridedSliceLayer.cpp index e80ec2277d..56051c28ee 100644 --- a/src/armnn/layers/StridedSliceLayer.cpp +++ b/src/armnn/layers/StridedSliceLayer.cpp @@ -36,7 +36,7 @@ std::unique_ptr<IWorkload> StridedSliceLayer::CreateWorkload(const IWorkloadFact SetAdditionalInfo(descriptor); - return factory.CreateStridedSlice(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::StridedSlice, descriptor, PrepInfoAndDesc(descriptor)); } StridedSliceLayer* StridedSliceLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SubtractionLayer.cpp b/src/armnn/layers/SubtractionLayer.cpp index c5f9ca9a7e..8e9b1733b7 100644 --- a/src/armnn/layers/SubtractionLayer.cpp +++ b/src/armnn/layers/SubtractionLayer.cpp @@ -24,7 +24,7 @@ std::unique_ptr<IWorkload> SubtractionLayer::CreateWorkload(const IWorkloadFacto SubtractionQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateSubtraction(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Subtraction, descriptor, PrepInfoAndDesc(descriptor)); } SubtractionLayer* SubtractionLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/SwitchLayer.cpp b/src/armnn/layers/SwitchLayer.cpp index 810bd33911..afa4d52f9d 100644 --- a/src/armnn/layers/SwitchLayer.cpp +++ b/src/armnn/layers/SwitchLayer.cpp @@ -21,7 +21,7 @@ std::unique_ptr<IWorkload> SwitchLayer::CreateWorkload(const IWorkloadFactory& f SwitchQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateSwitch(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Switch, descriptor, PrepInfoAndDesc(descriptor)); } SwitchLayer* SwitchLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/TransposeConvolution2dLayer.cpp b/src/armnn/layers/TransposeConvolution2dLayer.cpp index 689a3f5be3..a1f07f9eca 100644 --- a/src/armnn/layers/TransposeConvolution2dLayer.cpp +++ b/src/armnn/layers/TransposeConvolution2dLayer.cpp @@ -37,7 +37,7 @@ std::unique_ptr<IWorkload> TransposeConvolution2dLayer::CreateWorkload(const IWo SetAdditionalInfo(descriptor); - return factory.CreateTransposeConvolution2d(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::TransposeConvolution2d, descriptor, PrepInfoAndDesc(descriptor)); } TransposeConvolution2dLayer* TransposeConvolution2dLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/TransposeLayer.cpp b/src/armnn/layers/TransposeLayer.cpp index 3c34df9372..3340b9ddf9 100644 --- a/src/armnn/layers/TransposeLayer.cpp +++ b/src/armnn/layers/TransposeLayer.cpp @@ -27,7 +27,7 @@ std::unique_ptr<IWorkload> TransposeLayer::CreateWorkload(const IWorkloadFactory TransposeQueueDescriptor descriptor; SetAdditionalInfo(descriptor); - return factory.CreateTranspose(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::Transpose, descriptor, PrepInfoAndDesc(descriptor)); } TransposeLayer* TransposeLayer::Clone(Graph& graph) const diff --git a/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp b/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp index 911ba2e0ff..c9aaa8c171 100644 --- a/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp +++ b/src/armnn/layers/UnidirectionalSequenceLstmLayer.cpp @@ -74,7 +74,7 @@ std::unique_ptr<IWorkload> UnidirectionalSequenceLstmLayer::CreateWorkload(const SetAdditionalInfo(descriptor); - return factory.CreateUnidirectionalSequenceLstm(descriptor, PrepInfoAndDesc(descriptor)); + return factory.CreateWorkload(LayerType::UnidirectionalSequenceLstm, descriptor, PrepInfoAndDesc(descriptor)); } UnidirectionalSequenceLstmLayer* UnidirectionalSequenceLstmLayer::Clone(Graph& graph) const |