diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-10-04 16:53:58 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | ff421f2100e0e9e532f5fe78585300546af61690 (patch) | |
tree | 9ba5a1bfe64b5b10f70c64a965f9c5ca14de9ce3 /arm_compute/graph/nodes | |
parent | 925ca0f7402115da3bffb21c04fca0bc822c9b38 (diff) | |
download | ComputeLibrary-ff421f2100e0e9e532f5fe78585300546af61690.tar.gz |
COMPMID-601: Add GraphContext
GraphContext hold all the information about the hints that need to be
passed in the nodes. As these might expand, it serves as a centralized
class for such information.
Change-Id: I0b5527630fb97cc5fa500db0bac8307ff2ea36e6
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/90300
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/graph/nodes')
-rw-r--r-- | arm_compute/graph/nodes/ActivationLayer.h | 5 | ||||
-rw-r--r-- | arm_compute/graph/nodes/ConvolutionLayer.h | 3 | ||||
-rw-r--r-- | arm_compute/graph/nodes/FullyConnectedLayer.h | 5 | ||||
-rw-r--r-- | arm_compute/graph/nodes/NormalizationLayer.h | 3 | ||||
-rw-r--r-- | arm_compute/graph/nodes/PoolingLayer.h | 5 | ||||
-rw-r--r-- | arm_compute/graph/nodes/SoftmaxLayer.h | 3 |
6 files changed, 15 insertions, 9 deletions
diff --git a/arm_compute/graph/nodes/ActivationLayer.h b/arm_compute/graph/nodes/ActivationLayer.h index c23674e7b6..ea32dd02a2 100644 --- a/arm_compute/graph/nodes/ActivationLayer.h +++ b/arm_compute/graph/nodes/ActivationLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_H__ #define __ARM_COMPUTE_GRAPH_ACTIVATION_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/Tensor.h" #include "arm_compute/graph/Types.h" @@ -33,7 +34,7 @@ namespace arm_compute namespace graph { /** Activation Layer node */ -class ActivationLayer : public INode +class ActivationLayer final : public INode { public: /** Default Constructor @@ -43,7 +44,7 @@ public: ActivationLayer(const ActivationLayerInfo activation_info); // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; private: diff --git a/arm_compute/graph/nodes/ConvolutionLayer.h b/arm_compute/graph/nodes/ConvolutionLayer.h index fcd097bdaa..086bf03dfe 100644 --- a/arm_compute/graph/nodes/ConvolutionLayer.h +++ b/arm_compute/graph/nodes/ConvolutionLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_H__ #define __ARM_COMPUTE_GRAPH_CONVOLUTION_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/SubTensor.h" #include "arm_compute/graph/Tensor.h" @@ -76,7 +77,7 @@ public: } // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; private: diff --git a/arm_compute/graph/nodes/FullyConnectedLayer.h b/arm_compute/graph/nodes/FullyConnectedLayer.h index 3e1fe23b11..b05bc96c99 100644 --- a/arm_compute/graph/nodes/FullyConnectedLayer.h +++ b/arm_compute/graph/nodes/FullyConnectedLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_H__ #define __ARM_COMPUTE_GRAPH_FULLY_CONNECTED_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/Tensor.h" #include "arm_compute/graph/Types.h" @@ -33,7 +34,7 @@ namespace arm_compute namespace graph { /** Fully connected layer node */ -class FullyConnectedLayer : public INode +class FullyConnectedLayer final : public INode { public: /** Default constructor @@ -49,7 +50,7 @@ public: } // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; // Inherited methods overriden: diff --git a/arm_compute/graph/nodes/NormalizationLayer.h b/arm_compute/graph/nodes/NormalizationLayer.h index 40b9c2b467..52f67d2c31 100644 --- a/arm_compute/graph/nodes/NormalizationLayer.h +++ b/arm_compute/graph/nodes/NormalizationLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_H__ #define __ARM_COMPUTE_GRAPH_NORMALIZATION_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/Types.h" @@ -42,7 +43,7 @@ public: explicit NormalizationLayer(const NormalizationLayerInfo norm_info); // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; private: diff --git a/arm_compute/graph/nodes/PoolingLayer.h b/arm_compute/graph/nodes/PoolingLayer.h index 14e2c6d264..f07800a7b8 100644 --- a/arm_compute/graph/nodes/PoolingLayer.h +++ b/arm_compute/graph/nodes/PoolingLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_POOLING_LAYER_H__ #define __ARM_COMPUTE_GRAPH_POOLING_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/Tensor.h" #include "arm_compute/graph/Types.h" @@ -33,7 +34,7 @@ namespace arm_compute namespace graph { /** Pooling layer node */ -class PoolingLayer : public INode +class PoolingLayer final : public INode { public: /** Default Constructor @@ -43,7 +44,7 @@ public: PoolingLayer(const PoolingLayerInfo pool_info); // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; private: diff --git a/arm_compute/graph/nodes/SoftmaxLayer.h b/arm_compute/graph/nodes/SoftmaxLayer.h index 1779adae66..1515a0f28a 100644 --- a/arm_compute/graph/nodes/SoftmaxLayer.h +++ b/arm_compute/graph/nodes/SoftmaxLayer.h @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_H__ #define __ARM_COMPUTE_GRAPH_SOFTMAX_LAYER_H__ +#include "arm_compute/graph/GraphContext.h" #include "arm_compute/graph/INode.h" #include "arm_compute/graph/Tensor.h" #include "arm_compute/graph/Types.h" @@ -37,7 +38,7 @@ class SoftmaxLayer : public INode { public: // Inherited methods overriden: - std::unique_ptr<arm_compute::IFunction> instantiate_node(Hint hint, ITensor *input, ITensor *output) override; + std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override; void print_info() override; }; |