diff options
author | Isabella Gottardi <isabella.gottardi@arm.com> | 2018-11-27 08:51:10 +0000 |
---|---|---|
committer | Isabella Gottardi <isabella.gottardi@arm.com> | 2018-12-13 11:21:59 +0000 |
commit | 7234ed8c3d07c76963eb3bce9530994421ad7e67 (patch) | |
tree | 6834d5fc3cc23eb47bcfad3a4191d91c87c8f9e0 /arm_compute/graph/nodes | |
parent | 0e7210de821a7d1164017b8b9e11b53805185b25 (diff) | |
download | ComputeLibrary-7234ed8c3d07c76963eb3bce9530994421ad7e67.tar.gz |
COMPMID-1808: Add Detection Output Layer to the GraphAPI
COMPMID-1710: Integrate Detection ouput in MobilenetSSD graph example
Change-Id: I384d1eb492ef14ece58f2023ad7bbc16f834450b
Reviewed-on: https://review.mlplatform.org/356
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'arm_compute/graph/nodes')
-rw-r--r-- | arm_compute/graph/nodes/DetectionOutputLayerNode.h | 70 | ||||
-rw-r--r-- | arm_compute/graph/nodes/Nodes.h | 1 | ||||
-rw-r--r-- | arm_compute/graph/nodes/NodesFwd.h | 1 |
3 files changed, 72 insertions, 0 deletions
diff --git a/arm_compute/graph/nodes/DetectionOutputLayerNode.h b/arm_compute/graph/nodes/DetectionOutputLayerNode.h new file mode 100644 index 0000000000..da1b051528 --- /dev/null +++ b/arm_compute/graph/nodes/DetectionOutputLayerNode.h @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__ +#define __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__ + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** DetectionOutput Layer node */ +class DetectionOutputLayerNode final : public INode +{ +public: + /** Constructor + * + * @param[in] detection_info DetectionOutput Layer information + */ + DetectionOutputLayerNode(DetectionOutputLayerInfo detection_info); + /** DetectionOutput metadata accessor + * + * @return DetectionOutput Layer info + */ + DetectionOutputLayerInfo detection_output_info() const; + /** Computes detection output output descriptor + * + * @param[in] input_descriptor Input descriptor + * @param[in] info DetectionOutput operation attributes + * + * @return Output descriptor + */ + static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, const DetectionOutputLayerInfo &info); + + // Inherited overridden methods: + NodeType type() const override; + bool forward_descriptors() override; + TensorDescriptor configure_output(size_t idx) const override; + void accept(INodeVisitor &v) override; + +private: + DetectionOutputLayerInfo _info; + + // Each detection contains a bounding box, given by its coordinates xmin, ymin, xmax, ymax, associated at the respective image, label and a confidence + static const int detection_size = 7; +}; +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GRAPH_DETECTION_OUTPUT_LAYER_NODE_H__ */ diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 5c7599fbfd..c85c4dc375 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -33,6 +33,7 @@ #include "arm_compute/graph/nodes/ConvolutionLayerNode.h" #include "arm_compute/graph/nodes/DeconvolutionLayerNode.h" #include "arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h" +#include "arm_compute/graph/nodes/DetectionOutputLayerNode.h" #include "arm_compute/graph/nodes/DummyNode.h" #include "arm_compute/graph/nodes/EltwiseLayerNode.h" #include "arm_compute/graph/nodes/FlattenLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index f956b54c66..542c129ad6 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -39,6 +39,7 @@ class ConstNode; class ConvolutionLayerNode; class DeconvolutionLayerNode; class DepthwiseConvolutionLayerNode; +class DetectionOutputLayerNode; class DummyNode; class EltwiseLayerNode; class FlattenLayerNode; |