diff options
Diffstat (limited to 'arm_compute/graph/nodes')
45 files changed, 109 insertions, 75 deletions
diff --git a/arm_compute/graph/nodes/ActivationLayerNode.h b/arm_compute/graph/nodes/ActivationLayerNode.h index 4a98ee248f..fe5f273db5 100644 --- a/arm_compute/graph/nodes/ActivationLayerNode.h +++ b/arm_compute/graph/nodes/ActivationLayerNode.h @@ -39,8 +39,7 @@ public: * @param[in] info Activation Layer information * @param[in] out_quant_info (Optional) Output quantization info */ - ActivationLayerNode(ActivationLayerInfo info, - QuantizationInfo out_quant_info = QuantizationInfo()); + ActivationLayerNode(ActivationLayerInfo info, QuantizationInfo out_quant_info = QuantizationInfo()); /** Activation metadata accessor * * @return The activation info of the layer @@ -51,7 +50,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::ActivationLayer; diff --git a/arm_compute/graph/nodes/ArgMinMaxLayerNode.h b/arm_compute/graph/nodes/ArgMinMaxLayerNode.h index 69191add99..65fbc36db6 100644 --- a/arm_compute/graph/nodes/ArgMinMaxLayerNode.h +++ b/arm_compute/graph/nodes/ArgMinMaxLayerNode.h @@ -65,7 +65,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::ArgMinMaxLayer; diff --git a/arm_compute/graph/nodes/BatchNormalizationLayerNode.h b/arm_compute/graph/nodes/BatchNormalizationLayerNode.h index e7f4049df8..8583ed87eb 100644 --- a/arm_compute/graph/nodes/BatchNormalizationLayerNode.h +++ b/arm_compute/graph/nodes/BatchNormalizationLayerNode.h @@ -60,7 +60,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::BatchNormalizationLayer; diff --git a/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h index 57175eba2e..96c2544065 100644 --- a/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h +++ b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h @@ -50,7 +50,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: BoundingBoxTransformInfo _bbox_info; diff --git a/arm_compute/graph/nodes/ChannelShuffleLayerNode.h b/arm_compute/graph/nodes/ChannelShuffleLayerNode.h index 0696fe56fc..d296a2dcc3 100644 --- a/arm_compute/graph/nodes/ChannelShuffleLayerNode.h +++ b/arm_compute/graph/nodes/ChannelShuffleLayerNode.h @@ -49,7 +49,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: unsigned int _num_groups; diff --git a/arm_compute/graph/nodes/ConcatenateLayerNode.h b/arm_compute/graph/nodes/ConcatenateLayerNode.h index 8582403355..13398b1a61 100644 --- a/arm_compute/graph/nodes/ConcatenateLayerNode.h +++ b/arm_compute/graph/nodes/ConcatenateLayerNode.h @@ -47,7 +47,8 @@ public: * * @return Expected output descriptor */ - static TensorDescriptor compute_output_descriptor(const std::vector<TensorDescriptor> &input_descriptors, DataLayoutDimension axis); + static TensorDescriptor compute_output_descriptor(const std::vector<TensorDescriptor> &input_descriptors, + DataLayoutDimension axis); /** Disables or not the depth concatenate node * * @warning This is used when concatenate is performed using sub-tensors, where this node is used as a placeholder. @@ -78,7 +79,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: unsigned int _total_nodes; diff --git a/arm_compute/graph/nodes/ConstNode.h b/arm_compute/graph/nodes/ConstNode.h index b377c60208..400b9b4d9f 100644 --- a/arm_compute/graph/nodes/ConstNode.h +++ b/arm_compute/graph/nodes/ConstNode.h @@ -44,7 +44,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: TensorDescriptor _desc; diff --git a/arm_compute/graph/nodes/ConvolutionLayerNode.h b/arm_compute/graph/nodes/ConvolutionLayerNode.h index e4151c0f17..8a77b89f27 100644 --- a/arm_compute/graph/nodes/ConvolutionLayerNode.h +++ b/arm_compute/graph/nodes/ConvolutionLayerNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -90,6 +90,11 @@ public: * @param[in] fused_activation Fused activation to set */ void set_fused_activation(ActivationLayerInfo fused_activation); + /** Sets convolution info + * + * @param[in] info Convolution info to set + */ + void set_convolution_info(PadStrideInfo info); /** Computes convolution output descriptor * * @param[in] input_descriptor Input descriptor @@ -106,7 +111,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::ConvolutionLayer; diff --git a/arm_compute/graph/nodes/DeconvolutionLayerNode.h b/arm_compute/graph/nodes/DeconvolutionLayerNode.h index e74adb17aa..553d05985c 100644 --- a/arm_compute/graph/nodes/DeconvolutionLayerNode.h +++ b/arm_compute/graph/nodes/DeconvolutionLayerNode.h @@ -61,7 +61,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: descriptors::DeconvolutionLayerDescriptor descriptor; diff --git a/arm_compute/graph/nodes/DepthToSpaceLayerNode.h b/arm_compute/graph/nodes/DepthToSpaceLayerNode.h index 25e30e2c67..5fbcc670ff 100644 --- a/arm_compute/graph/nodes/DepthToSpaceLayerNode.h +++ b/arm_compute/graph/nodes/DepthToSpaceLayerNode.h @@ -56,7 +56,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: int _block_shape; diff --git a/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h b/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h index 59847a92fc..441d68d2b8 100644 --- a/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h +++ b/arm_compute/graph/nodes/DepthwiseConvolutionLayerNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -78,6 +78,11 @@ public: * @param[in] fused_activation Fused activation to set */ void set_fused_activation(ActivationLayerInfo fused_activation); + /** Sets convolution info + * + * @param[in] info Convolution info to set + */ + void set_convolution_info(PadStrideInfo info); /** Computes depthwise convolution output descriptor * * @param[in] input_descriptor Input descriptor @@ -96,7 +101,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::DepthwiseConvolutionLayer; diff --git a/arm_compute/graph/nodes/DequantizationLayerNode.h b/arm_compute/graph/nodes/DequantizationLayerNode.h index 4910938d47..1cce71373f 100644 --- a/arm_compute/graph/nodes/DequantizationLayerNode.h +++ b/arm_compute/graph/nodes/DequantizationLayerNode.h @@ -46,8 +46,8 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; }; } // namespace graph } // namespace arm_compute -#endif /* ARM_COMPUTE_GRAPH_DEQUANTIZATION_NODE_H */
\ No newline at end of file +#endif /* ARM_COMPUTE_GRAPH_DEQUANTIZATION_NODE_H */ diff --git a/arm_compute/graph/nodes/DetectionOutputLayerNode.h b/arm_compute/graph/nodes/DetectionOutputLayerNode.h index b4b910c40e..c3e067e430 100644 --- a/arm_compute/graph/nodes/DetectionOutputLayerNode.h +++ b/arm_compute/graph/nodes/DetectionOutputLayerNode.h @@ -51,13 +51,14 @@ public: * * @return Output descriptor */ - static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, const DetectionOutputLayerInfo &info); + 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; + void accept(INodeVisitor &v) override; private: DetectionOutputLayerInfo _info; diff --git a/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h b/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h index 6ff78aee07..a53aaf2b9c 100644 --- a/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h +++ b/arm_compute/graph/nodes/DetectionPostProcessLayerNode.h @@ -49,7 +49,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: DetectionPostProcessLayerInfo _info; @@ -59,4 +59,4 @@ private: }; } // namespace graph } // namespace arm_compute -#endif /* ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H */
\ No newline at end of file +#endif /* ARM_COMPUTE_GRAPH_DETECTION_POST_PROCESS_LAYER_NODE_H */ diff --git a/arm_compute/graph/nodes/DummyNode.h b/arm_compute/graph/nodes/DummyNode.h index 645f1b325d..2263525a72 100644 --- a/arm_compute/graph/nodes/DummyNode.h +++ b/arm_compute/graph/nodes/DummyNode.h @@ -51,11 +51,11 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: TensorShape _shape; }; } // namespace graph } // namespace arm_compute -#endif /* ARM_COMPUTE_GRAPH_DUMMY_NODE_H */
\ No newline at end of file +#endif /* ARM_COMPUTE_GRAPH_DUMMY_NODE_H */ diff --git a/arm_compute/graph/nodes/EltwiseLayerNode.h b/arm_compute/graph/nodes/EltwiseLayerNode.h index 7a6d8e8303..258298259f 100644 --- a/arm_compute/graph/nodes/EltwiseLayerNode.h +++ b/arm_compute/graph/nodes/EltwiseLayerNode.h @@ -79,7 +79,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; static constexpr NodeType node_type = NodeType::EltwiseLayer; @@ -112,7 +112,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; static constexpr NodeType node_type = NodeType::UnaryEltwiseLayer; diff --git a/arm_compute/graph/nodes/FlattenLayerNode.h b/arm_compute/graph/nodes/FlattenLayerNode.h index 046114c291..af104707a1 100644 --- a/arm_compute/graph/nodes/FlattenLayerNode.h +++ b/arm_compute/graph/nodes/FlattenLayerNode.h @@ -41,7 +41,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; }; } // namespace graph } // namespace arm_compute diff --git a/arm_compute/graph/nodes/FullyConnectedLayerNode.h b/arm_compute/graph/nodes/FullyConnectedLayerNode.h index a7712f46b9..3bcf386d64 100644 --- a/arm_compute/graph/nodes/FullyConnectedLayerNode.h +++ b/arm_compute/graph/nodes/FullyConnectedLayerNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -39,10 +39,22 @@ public: * @param[in] num_outputs Number of neurons in the layer * @param[in] out_quant_info (Optional) Output quantization info * @param[in] fc_info (Optional) Additional information about the fully connected layer + * @param[in] fast_math_hint (Optional) Fast math hint */ FullyConnectedLayerNode(unsigned int num_outputs, QuantizationInfo out_quant_info = QuantizationInfo(), - FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo()); + FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), + FastMathHint fast_math_hint = FastMathHint::Disabled); + /** Sets the fast math fast hint + * + * @param[in] hint Hint to use for fullyconnected layer + */ + void set_fast_math_hint(FastMathHint hint); + /** Fast math hint accessor + * + * @return Fast math hint to be used by the node + */ + FastMathHint fast_math_hint() const; /** Sets fused activation * * @param[in] fused_activation Fused activation to set @@ -61,7 +73,7 @@ public: */ static TensorDescriptor compute_weights_descriptor(const TensorDescriptor &input_descriptor, unsigned int num_outputs, - FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), + FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), const QuantizationInfo &weights_quant_info = QuantizationInfo()); /** Computes fully connected layer output descriptor * @@ -86,7 +98,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; static constexpr NodeType node_type = NodeType::FullyConnectedLayer; @@ -94,6 +106,7 @@ private: unsigned int _num_outputs; QuantizationInfo _out_quant_info; FullyConnectedLayerInfo _info; + FastMathHint _fast_math_hint; }; } // namespace graph } // namespace arm_compute diff --git a/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h b/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h index b3661c300f..d891ea49eb 100644 --- a/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h +++ b/arm_compute/graph/nodes/FusedConvolutionBatchNormalizationNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019, 2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -43,7 +43,8 @@ public: * @param[in] fast_math_hint (Optional) Fast math hint * @param[in] fused_activation (Optional) Fused activation layer. Disabled if not specified */ - FusedConvolutionBatchNormalizationNode(float epsilon, PadStrideInfo info, + FusedConvolutionBatchNormalizationNode(float epsilon, + PadStrideInfo info, unsigned int num_groups = 1, ConvolutionMethod method = ConvolutionMethod::Default, FastMathHint fast_math_hint = FastMathHint::Disabled, @@ -100,7 +101,7 @@ public: */ ConvolutionMethod convolution_method() const; - /** Sets the fast math fast hint + /** Sets the fast math hint * * @param[in] hint Hint to use for convolution */ @@ -122,7 +123,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::FusedConvolutionBatchNormalizationLayer; diff --git a/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h b/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h index a01cb9dc42..a61b155151 100644 --- a/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h +++ b/arm_compute/graph/nodes/FusedDepthwiseConvolutionBatchNormalizationNode.h @@ -46,7 +46,7 @@ public: PadStrideInfo info, unsigned int depth_multiplier, DepthwiseConvolutionMethod method, - ActivationLayerInfo fused_activation = ActivationLayerInfo()); + ActivationLayerInfo fused_activation = ActivationLayerInfo()); /** Sets the depthwise convolution layer method to use * @@ -117,7 +117,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::FusedDepthwiseConvolutionBatchNormalizationLayer; diff --git a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h index 6f8edc8758..b5e4b9781c 100644 --- a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h +++ b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h @@ -50,7 +50,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: GenerateProposalsInfo _info; diff --git a/arm_compute/graph/nodes/InputNode.h b/arm_compute/graph/nodes/InputNode.h index 07091af64f..0983d25a59 100644 --- a/arm_compute/graph/nodes/InputNode.h +++ b/arm_compute/graph/nodes/InputNode.h @@ -44,7 +44,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: TensorDescriptor _desc; diff --git a/arm_compute/graph/nodes/L2NormalizeLayerNode.h b/arm_compute/graph/nodes/L2NormalizeLayerNode.h index 8edc5b0bf3..ed11412b70 100644 --- a/arm_compute/graph/nodes/L2NormalizeLayerNode.h +++ b/arm_compute/graph/nodes/L2NormalizeLayerNode.h @@ -68,7 +68,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: int _axis; diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index edb1876722..d4ad32b6f0 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_GRAPH_NODES_H -#define ARM_COMPUTE_GRAPH_NODES_H +#ifndef ACL_ARM_COMPUTE_GRAPH_NODES_NODES_H +#define ACL_ARM_COMPUTE_GRAPH_NODES_NODES_H #include "arm_compute/graph/nodes/ActivationLayerNode.h" #include "arm_compute/graph/nodes/ArgMinMaxLayerNode.h" @@ -50,22 +50,22 @@ #include "arm_compute/graph/nodes/NormalizationLayerNode.h" #include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h" #include "arm_compute/graph/nodes/OutputNode.h" -#include "arm_compute/graph/nodes/PReluLayerNode.h" #include "arm_compute/graph/nodes/PadLayerNode.h" #include "arm_compute/graph/nodes/PermuteLayerNode.h" #include "arm_compute/graph/nodes/PoolingLayerNode.h" +#include "arm_compute/graph/nodes/PReluLayerNode.h" #include "arm_compute/graph/nodes/PrintLayerNode.h" #include "arm_compute/graph/nodes/PriorBoxLayerNode.h" #include "arm_compute/graph/nodes/QuantizationLayerNode.h" -#include "arm_compute/graph/nodes/ROIAlignLayerNode.h" #include "arm_compute/graph/nodes/ReductionLayerNode.h" #include "arm_compute/graph/nodes/ReorgLayerNode.h" #include "arm_compute/graph/nodes/ReshapeLayerNode.h" #include "arm_compute/graph/nodes/ResizeLayerNode.h" +#include "arm_compute/graph/nodes/ROIAlignLayerNode.h" #include "arm_compute/graph/nodes/SliceLayerNode.h" #include "arm_compute/graph/nodes/SoftmaxLayerNode.h" #include "arm_compute/graph/nodes/SplitLayerNode.h" #include "arm_compute/graph/nodes/StackLayerNode.h" #include "arm_compute/graph/nodes/StridedSliceLayerNode.h" -#endif /* ARM_COMPUTE_GRAPH_NODES_H */ +#endif // ACL_ARM_COMPUTE_GRAPH_NODES_NODES_H diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 485361296a..580f339468 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_GRAPH_NODES_FWD_H -#define ARM_COMPUTE_GRAPH_NODES_FWD_H +#ifndef ACL_ARM_COMPUTE_GRAPH_NODES_NODESFWD_H +#define ACL_ARM_COMPUTE_GRAPH_NODES_NODESFWD_H namespace arm_compute { @@ -75,4 +75,4 @@ class StackLayerNode; class StridedSliceLayerNode; } // namespace graph } // namespace arm_compute -#endif /* ARM_COMPUTE_GRAPH_NODES_FWD_H */ +#endif // ACL_ARM_COMPUTE_GRAPH_NODES_NODESFWD_H diff --git a/arm_compute/graph/nodes/NormalizationLayerNode.h b/arm_compute/graph/nodes/NormalizationLayerNode.h index 503b859e53..86f2fb9dba 100644 --- a/arm_compute/graph/nodes/NormalizationLayerNode.h +++ b/arm_compute/graph/nodes/NormalizationLayerNode.h @@ -49,7 +49,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: NormalizationLayerInfo _info; diff --git a/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h index 4d84c20de0..158acc4c23 100644 --- a/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h +++ b/arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h @@ -41,7 +41,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; }; } // namespace graph } // namespace arm_compute diff --git a/arm_compute/graph/nodes/OutputNode.h b/arm_compute/graph/nodes/OutputNode.h index c91bc6b699..75484ab328 100644 --- a/arm_compute/graph/nodes/OutputNode.h +++ b/arm_compute/graph/nodes/OutputNode.h @@ -41,7 +41,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; }; } // namespace graph } // namespace arm_compute diff --git a/arm_compute/graph/nodes/PReluLayerNode.h b/arm_compute/graph/nodes/PReluLayerNode.h index b8e6c1ae7f..532fdccb3a 100644 --- a/arm_compute/graph/nodes/PReluLayerNode.h +++ b/arm_compute/graph/nodes/PReluLayerNode.h @@ -41,7 +41,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; }; } // namespace graph } // namespace arm_compute diff --git a/arm_compute/graph/nodes/PadLayerNode.h b/arm_compute/graph/nodes/PadLayerNode.h index 8fcbc52313..dcb5ea595b 100644 --- a/arm_compute/graph/nodes/PadLayerNode.h +++ b/arm_compute/graph/nodes/PadLayerNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -56,7 +56,10 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; + +public: + static constexpr NodeType node_type = NodeType::PadLayer; private: PaddingList _padding; diff --git a/arm_compute/graph/nodes/PermuteLayerNode.h b/arm_compute/graph/nodes/PermuteLayerNode.h index 0b2380b51c..62654e777c 100644 --- a/arm_compute/graph/nodes/PermuteLayerNode.h +++ b/arm_compute/graph/nodes/PermuteLayerNode.h @@ -51,7 +51,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: PermutationVector _perm; diff --git a/arm_compute/graph/nodes/PoolingLayerNode.h b/arm_compute/graph/nodes/PoolingLayerNode.h index b336bb906f..c81f3f98dc 100644 --- a/arm_compute/graph/nodes/PoolingLayerNode.h +++ b/arm_compute/graph/nodes/PoolingLayerNode.h @@ -57,7 +57,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: PoolingLayerInfo _info; diff --git a/arm_compute/graph/nodes/PrintLayerNode.h b/arm_compute/graph/nodes/PrintLayerNode.h index b57ac1f6d4..e7accc8015 100644 --- a/arm_compute/graph/nodes/PrintLayerNode.h +++ b/arm_compute/graph/nodes/PrintLayerNode.h @@ -43,7 +43,9 @@ public: * @param[in] format_info (Optional) Format info. * @param[in] transform (Optional) Input transform function. */ - PrintLayerNode(std::ostream &stream, const IOFormatInfo &format_info = IOFormatInfo(), const std::function<ITensor *(ITensor *)> transform = nullptr); + PrintLayerNode(std::ostream &stream, + const IOFormatInfo &format_info = IOFormatInfo(), + const std::function<ITensor *(ITensor *)> transform = nullptr); /** Stream metadata accessor * @@ -67,7 +69,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: std::ostream &_stream; diff --git a/arm_compute/graph/nodes/PriorBoxLayerNode.h b/arm_compute/graph/nodes/PriorBoxLayerNode.h index c7eadd1fe5..db36bfb1e0 100644 --- a/arm_compute/graph/nodes/PriorBoxLayerNode.h +++ b/arm_compute/graph/nodes/PriorBoxLayerNode.h @@ -51,13 +51,14 @@ public: * * @return Output descriptor */ - static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, const PriorBoxLayerInfo &info); + static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, + const PriorBoxLayerInfo &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; + void accept(INodeVisitor &v) override; private: PriorBoxLayerInfo _info; diff --git a/arm_compute/graph/nodes/QuantizationLayerNode.h b/arm_compute/graph/nodes/QuantizationLayerNode.h index e5d81afa0e..b8e4c7d27b 100644 --- a/arm_compute/graph/nodes/QuantizationLayerNode.h +++ b/arm_compute/graph/nodes/QuantizationLayerNode.h @@ -51,7 +51,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; static constexpr NodeType node_type = NodeType::QuantizationLayer; diff --git a/arm_compute/graph/nodes/ROIAlignLayerNode.h b/arm_compute/graph/nodes/ROIAlignLayerNode.h index 5abd0659b5..70309a551c 100644 --- a/arm_compute/graph/nodes/ROIAlignLayerNode.h +++ b/arm_compute/graph/nodes/ROIAlignLayerNode.h @@ -56,7 +56,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: ROIPoolingLayerInfo _pool_info; diff --git a/arm_compute/graph/nodes/ReductionLayerNode.h b/arm_compute/graph/nodes/ReductionLayerNode.h index b8d295945c..ff99466c8f 100644 --- a/arm_compute/graph/nodes/ReductionLayerNode.h +++ b/arm_compute/graph/nodes/ReductionLayerNode.h @@ -56,7 +56,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: ReductionOperation _op; diff --git a/arm_compute/graph/nodes/ReorgLayerNode.h b/arm_compute/graph/nodes/ReorgLayerNode.h index 986692ed28..a3bbcdb00f 100644 --- a/arm_compute/graph/nodes/ReorgLayerNode.h +++ b/arm_compute/graph/nodes/ReorgLayerNode.h @@ -57,7 +57,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: int _stride; diff --git a/arm_compute/graph/nodes/ReshapeLayerNode.h b/arm_compute/graph/nodes/ReshapeLayerNode.h index 727d253ce5..992275c2b1 100644 --- a/arm_compute/graph/nodes/ReshapeLayerNode.h +++ b/arm_compute/graph/nodes/ReshapeLayerNode.h @@ -44,7 +44,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: TensorShape _shape; diff --git a/arm_compute/graph/nodes/ResizeLayerNode.h b/arm_compute/graph/nodes/ResizeLayerNode.h index 79f8889f9c..480d6e517f 100644 --- a/arm_compute/graph/nodes/ResizeLayerNode.h +++ b/arm_compute/graph/nodes/ResizeLayerNode.h @@ -51,7 +51,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: InterpolationPolicy _policy; diff --git a/arm_compute/graph/nodes/SliceLayerNode.h b/arm_compute/graph/nodes/SliceLayerNode.h index 08d3794e26..63f266b217 100644 --- a/arm_compute/graph/nodes/SliceLayerNode.h +++ b/arm_compute/graph/nodes/SliceLayerNode.h @@ -51,7 +51,8 @@ public: * @return Output descriptor */ static TensorDescriptor compute_output_descriptor(const TensorDescriptor &input_descriptor, - const Coordinates &starts, const Coordinates &ends); + const Coordinates &starts, + const Coordinates &ends); /** Start coordinates accessor * * @return Start coordinates of the dimensions @@ -67,7 +68,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: Coordinates _starts; diff --git a/arm_compute/graph/nodes/SoftmaxLayerNode.h b/arm_compute/graph/nodes/SoftmaxLayerNode.h index 0868c6ff16..2cb1ac2cf4 100644 --- a/arm_compute/graph/nodes/SoftmaxLayerNode.h +++ b/arm_compute/graph/nodes/SoftmaxLayerNode.h @@ -49,7 +49,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; public: static constexpr NodeType node_type = NodeType::SoftmaxLayer; diff --git a/arm_compute/graph/nodes/SplitLayerNode.h b/arm_compute/graph/nodes/SplitLayerNode.h index 13cccdd447..5e6df53c0f 100644 --- a/arm_compute/graph/nodes/SplitLayerNode.h +++ b/arm_compute/graph/nodes/SplitLayerNode.h @@ -55,7 +55,9 @@ public: * @return A pair with the descriptor of the split and the starting coordinates */ std::pair<TensorDescriptor, Coordinates> compute_output_descriptor(const TensorDescriptor &input_descriptor, - unsigned int num_splits, int axis, unsigned int idx); + unsigned int num_splits, + int axis, + unsigned int idx); /** Number of splits accessor * * @return Number of splits @@ -72,7 +74,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: unsigned int _num_splits; diff --git a/arm_compute/graph/nodes/StackLayerNode.h b/arm_compute/graph/nodes/StackLayerNode.h index 2990895c2b..9f0767c9f2 100644 --- a/arm_compute/graph/nodes/StackLayerNode.h +++ b/arm_compute/graph/nodes/StackLayerNode.h @@ -58,7 +58,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: unsigned int _total_nodes; diff --git a/arm_compute/graph/nodes/StridedSliceLayerNode.h b/arm_compute/graph/nodes/StridedSliceLayerNode.h index 6039f312b3..f521feb780 100644 --- a/arm_compute/graph/nodes/StridedSliceLayerNode.h +++ b/arm_compute/graph/nodes/StridedSliceLayerNode.h @@ -84,7 +84,7 @@ public: NodeType type() const override; bool forward_descriptors() override; TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; + void accept(INodeVisitor &v) override; private: Coordinates _starts; |