diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-02-11 12:21:27 +0000 |
---|---|---|
committer | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-02-11 13:33:20 +0000 |
commit | 0085978ac40ecd008195d635cd009a1d4f49fb74 (patch) | |
tree | 560c296e74b94826d6338b7d0d92224ae526a426 /src/armnn/LayerVisitorBase.hpp | |
parent | 3dad5acc5d8eda6fc472b9a255c1d893d4e1f942 (diff) | |
download | armnn-0085978ac40ecd008195d635cd009a1d4f49fb74.tar.gz |
IVGCVSW-2676 Make biases optional in ILayerVisitor for Convolution2D, DepthwiseConvolution2D and FullyConnected
Change-Id: I3048504ff699fdb266488e7c07b7262e5843d4b0
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Diffstat (limited to 'src/armnn/LayerVisitorBase.hpp')
-rw-r--r-- | src/armnn/LayerVisitorBase.hpp | 231 |
1 files changed, 108 insertions, 123 deletions
diff --git a/src/armnn/LayerVisitorBase.hpp b/src/armnn/LayerVisitorBase.hpp index 641ca31e2d..2c37a21786 100644 --- a/src/armnn/LayerVisitorBase.hpp +++ b/src/armnn/LayerVisitorBase.hpp @@ -29,161 +29,146 @@ protected: virtual ~LayerVisitorBase() {} public: - virtual void VisitInputLayer(const IConnectableLayer*, - LayerBindingId, - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitConvolution2dLayer(const IConnectableLayer*, - const Convolution2dDescriptor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitConvolution2dLayer(const IConnectableLayer*, - const Convolution2dDescriptor&, - const ConstTensor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitDepthwiseConvolution2dLayer(const IConnectableLayer*, - const DepthwiseConvolution2dDescriptor&, - const ConstTensor& , - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitDepthwiseConvolution2dLayer(const IConnectableLayer*, - const DepthwiseConvolution2dDescriptor&, - const ConstTensor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitDetectionPostProcessLayer(const IConnectableLayer*, - const DetectionPostProcessDescriptor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } - - virtual void VisitFullyConnectedLayer(const IConnectableLayer*, - const FullyConnectedDescriptor&, + void VisitInputLayer(const IConnectableLayer*, + LayerBindingId, + const char*) override { DefaultPolicy::Apply(); } + + void VisitConvolution2dLayer(const IConnectableLayer*, + const Convolution2dDescriptor&, + const ConstTensor&, + const Optional<ConstTensor>&, + const char*) override { DefaultPolicy::Apply(); } + + void VisitDepthwiseConvolution2dLayer(const IConnectableLayer*, + const DepthwiseConvolution2dDescriptor&, const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } + const Optional<ConstTensor>&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitFullyConnectedLayer(const IConnectableLayer*, - const FullyConnectedDescriptor&, - const ConstTensor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } + void VisitDetectionPostProcessLayer(const IConnectableLayer*, + const DetectionPostProcessDescriptor&, + const ConstTensor&, + const char*) override { DefaultPolicy::Apply(); } + + void VisitFullyConnectedLayer(const IConnectableLayer*, + const FullyConnectedDescriptor&, + const ConstTensor&, + const Optional<ConstTensor>&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitPermuteLayer(const IConnectableLayer*, - const PermuteDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitPermuteLayer(const IConnectableLayer*, + const PermuteDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitBatchToSpaceNdLayer(const IConnectableLayer*, - const BatchToSpaceNdDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitBatchToSpaceNdLayer(const IConnectableLayer*, + const BatchToSpaceNdDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitPooling2dLayer(const IConnectableLayer*, - const Pooling2dDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitPooling2dLayer(const IConnectableLayer*, + const Pooling2dDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitActivationLayer(const IConnectableLayer*, - const ActivationDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitActivationLayer(const IConnectableLayer*, + const ActivationDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitNormalizationLayer(const IConnectableLayer*, - const NormalizationDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitNormalizationLayer(const IConnectableLayer*, + const NormalizationDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitSoftmaxLayer(const IConnectableLayer*, - const SoftmaxDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitSoftmaxLayer(const IConnectableLayer*, + const SoftmaxDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitSplitterLayer(const IConnectableLayer*, - const ViewsDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitSplitterLayer(const IConnectableLayer*, + const ViewsDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitMergerLayer(const IConnectableLayer*, - const OriginsDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitMergerLayer(const IConnectableLayer*, + const OriginsDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitAdditionLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitAdditionLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitMultiplicationLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitMultiplicationLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitBatchNormalizationLayer(const IConnectableLayer*, - const BatchNormalizationDescriptor&, - const ConstTensor&, - const ConstTensor&, - const ConstTensor&, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } + void VisitBatchNormalizationLayer(const IConnectableLayer*, + const BatchNormalizationDescriptor&, + const ConstTensor&, + const ConstTensor&, + const ConstTensor&, + const ConstTensor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitResizeBilinearLayer(const IConnectableLayer*, - const ResizeBilinearDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitResizeBilinearLayer(const IConnectableLayer*, + const ResizeBilinearDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitL2NormalizationLayer(const IConnectableLayer*, - const L2NormalizationDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitL2NormalizationLayer(const IConnectableLayer*, + const L2NormalizationDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitConstantLayer(const IConnectableLayer*, - const ConstTensor&, - const char*) { DefaultPolicy::Apply(); } + void VisitConstantLayer(const IConnectableLayer*, + const ConstTensor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitReshapeLayer(const IConnectableLayer*, - const ReshapeDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitReshapeLayer(const IConnectableLayer*, + const ReshapeDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitSpaceToBatchNdLayer(const IConnectableLayer*, - const SpaceToBatchNdDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitSpaceToBatchNdLayer(const IConnectableLayer*, + const SpaceToBatchNdDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitFloorLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitFloorLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitOutputLayer(const IConnectableLayer*, - LayerBindingId id, - const char*) { DefaultPolicy::Apply(); } + void VisitOutputLayer(const IConnectableLayer*, + LayerBindingId id, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitLstmLayer(const IConnectableLayer*, - const LstmDescriptor&, - const LstmInputParams&, - const char*) { DefaultPolicy::Apply(); } + void VisitLstmLayer(const IConnectableLayer*, + const LstmDescriptor&, + const LstmInputParams&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitDivisionLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitDivisionLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitSubtractionLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitSubtractionLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitMaximumLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitMaximumLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitMeanLayer(const IConnectableLayer*, - const MeanDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitMeanLayer(const IConnectableLayer*, + const MeanDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitPadLayer(const IConnectableLayer*, - const PadDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitPadLayer(const IConnectableLayer*, + const PadDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitStridedSliceLayer(const IConnectableLayer*, - const StridedSliceDescriptor&, - const char*) { DefaultPolicy::Apply(); } + void VisitStridedSliceLayer(const IConnectableLayer*, + const StridedSliceDescriptor&, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitMinimumLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitMinimumLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitGreaterLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitGreaterLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitEqualLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitEqualLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitRsqrtLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitRsqrtLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } - virtual void VisitGatherLayer(const IConnectableLayer*, - const char*) { DefaultPolicy::Apply(); } + void VisitGatherLayer(const IConnectableLayer*, + const char*) override { DefaultPolicy::Apply(); } }; } //namespace armnn |