diff options
author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-01-23 18:06:26 +0000 |
---|---|---|
committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-01-24 15:02:11 +0000 |
commit | 94dd5d87a1d3a05a2289e309a77a3851d9ec2741 (patch) | |
tree | 4661e8f4a792e2468daff4157e4a9f089fc06da0 /include | |
parent | 2b4d88e34ac1f965417fd236fd4786f26bae2042 (diff) | |
download | armnn-94dd5d87a1d3a05a2289e309a77a3851d9ec2741.tar.gz |
IVGCVSW-2555 Add no-op implementation for Detection PostProcess
* Added DetectionPostProcessQueueDescriptor to WorkloadData
* Added CreateDetectionPostProcess function in WorkloadFactory.hpp
* Added stub implementation of the CreateDetectionPostProcess
in workload factories
* Added DetectionPostProcessLayer stub implementation
* Added AddDetectionPostProcessLayer to Network
* Added IsDetectionPostProcessSupported to LayerSupportBase
Change-Id: Ifc071b3b6b12877c997bdcc43d769c8f891d5c6c
Diffstat (limited to 'include')
-rw-r--r-- | include/armnn/Descriptors.hpp | 4 | ||||
-rw-r--r-- | include/armnn/DescriptorsFwd.hpp | 1 | ||||
-rw-r--r-- | include/armnn/ILayerSupport.hpp | 6 | ||||
-rw-r--r-- | include/armnn/INetwork.hpp | 7 |
4 files changed, 18 insertions, 0 deletions
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 4497d0da9e..44235c7ada 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -327,6 +327,10 @@ struct DepthwiseConvolution2dDescriptor DataLayout m_DataLayout; }; +struct DetectionPostProcessDescriptor +{ +}; + /// A NormalizationDescriptor for the NormalizationLayer. struct NormalizationDescriptor { diff --git a/include/armnn/DescriptorsFwd.hpp b/include/armnn/DescriptorsFwd.hpp index c1d21b5665..f0a4cffab7 100644 --- a/include/armnn/DescriptorsFwd.hpp +++ b/include/armnn/DescriptorsFwd.hpp @@ -13,6 +13,7 @@ struct BatchToSpaceNdDescriptor; struct Convolution2dDescriptor; struct DebugDescriptor; struct DepthwiseConvolution2dDescriptor; +struct DetectionPostProcessDescriptor; struct FakeQuantizationDescriptor; struct FullyConnectedDescriptor; struct L2NormalizationDescriptor; diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index a603229b96..b5f9e6ac6c 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -77,6 +77,12 @@ public: const Optional<TensorInfo>& biases, Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const = 0; + virtual bool IsDetectionPostProcessSupported( + const TensorInfo& input0, + const TensorInfo& input1, + const DetectionPostProcessDescriptor& descriptor, + Optional<std::string&> reasonIfUnsupported = EmptyOptional()) const = 0; + virtual bool IsDivisionSupported(const TensorInfo& input0, const TensorInfo& input1, const TensorInfo& output, diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index 05962b95b7..1f7354dd35 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -127,6 +127,13 @@ public: const ConstTensor& biases, const char* name = nullptr) = 0; + /// Adds a Detection PostProcess layer to the network. + /// @param descriptor - Description of the Detection PostProcess layer. + /// @param name - Optional name for the layer. + /// @return - Interface for configuring the layer. + virtual IConnectableLayer* AddDetectionPostProcessLayer( + const DetectionPostProcessDescriptor& descriptor, const char* name = nullptr) =0; + /// Adds a fully connected layer to the network. /// @param fullyConnectedDescriptor - Description of the fully connected layer. /// @param weights - Tensor for the weights data. |