aboutsummaryrefslogtreecommitdiff
path: root/arm_compute/graph
diff options
context:
space:
mode:
authorMichalis Spyrou <michalis.spyrou@arm.com>2017-10-02 17:44:52 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:35:24 +0000
commite472082f831815c217677e3f1802ecaae1348e65 (patch)
tree896fc2631e0d1113f9bd33ffb730973e886f2717 /arm_compute/graph
parent744b5edd1e7eedab8ac52a8cea33bf62fb95affc (diff)
downloadComputeLibrary-e472082f831815c217677e3f1802ecaae1348e65.tar.gz
COMPMID-549 Create a Logger for GraphAPI
Change-Id: If912d8232e12cd496923d55d386898450dac09e2 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89897 Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com> Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute/graph')
-rw-r--r--arm_compute/graph/Graph.h6
-rw-r--r--arm_compute/graph/INode.h4
-rw-r--r--arm_compute/graph/nodes/ActivationLayer.h1
-rw-r--r--arm_compute/graph/nodes/ConvolutionLayer.h9
-rw-r--r--arm_compute/graph/nodes/FullyConnectedLayer.h1
-rw-r--r--arm_compute/graph/nodes/NormalizationLayer.h1
-rw-r--r--arm_compute/graph/nodes/PoolingLayer.h1
-rw-r--r--arm_compute/graph/nodes/SoftmaxLayer.h2
8 files changed, 7 insertions, 18 deletions
diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h
index da41548119..9d06f44bee 100644
--- a/arm_compute/graph/Graph.h
+++ b/arm_compute/graph/Graph.h
@@ -70,11 +70,7 @@ public:
* @param[in] tmp Output info to set
*/
void set_temp(TensorInfo &&tmp);
- /** Sets whether to enable information print out
- *
- * @param[in] is_enabled Set to true if need info printed out
- */
- void set_info_enablement(bool is_enabled);
+
/** Returns the graph hints that are currently used
*
* @return Graph hints
diff --git a/arm_compute/graph/INode.h b/arm_compute/graph/INode.h
index 6ce9b1b986..1b22bdf639 100644
--- a/arm_compute/graph/INode.h
+++ b/arm_compute/graph/INode.h
@@ -58,8 +58,6 @@ public:
*/
TargetHint override_target_hint(TargetHint target_hint) const;
- virtual void print_info() = 0;
-
protected:
/** Interface to be implement that override the hints
*
@@ -71,8 +69,6 @@ protected:
protected:
TargetHint _target_hint{ TargetHint::DONT_CARE };
- ITensor *_input{ nullptr };
- ITensor *_output{ nullptr };
};
} // namespace graph
} // namespace arm_compute
diff --git a/arm_compute/graph/nodes/ActivationLayer.h b/arm_compute/graph/nodes/ActivationLayer.h
index ea32dd02a2..efe8112e77 100644
--- a/arm_compute/graph/nodes/ActivationLayer.h
+++ b/arm_compute/graph/nodes/ActivationLayer.h
@@ -45,7 +45,6 @@ public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
private:
const ActivationLayerInfo _activation_info; /**< Activation layer info */
diff --git a/arm_compute/graph/nodes/ConvolutionLayer.h b/arm_compute/graph/nodes/ConvolutionLayer.h
index 086bf03dfe..04ba3dd6b7 100644
--- a/arm_compute/graph/nodes/ConvolutionLayer.h
+++ b/arm_compute/graph/nodes/ConvolutionLayer.h
@@ -78,23 +78,26 @@ public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
private:
/** Instantiates a non-grouped convolution
*
+ * @param[in] input Input tensor
+ * @param[in] output Output tensor
* @param[in] conv_method_hint Hint that specifies which convolution layer method to use
*
* @return Convolution function
*/
- std::unique_ptr<arm_compute::IFunction> instantiate_convolution(ConvolutionMethodHint conv_method_hint);
+ std::unique_ptr<arm_compute::IFunction> instantiate_convolution(ITensor *input, ITensor *output, ConvolutionMethodHint conv_method_hint);
/** Instantiates a grouped convolution
*
+ * @param[in] input Input tensor
+ * @param[in] output Output tensor
* @param[in] conv_method_hint Hint that specifies which convolution layer method to use
*
* @return Grouped Convolution function
*/
- std::unique_ptr<arm_compute::IFunction> instantiate_grouped_convolution(ConvolutionMethodHint conv_method_hint);
+ std::unique_ptr<arm_compute::IFunction> instantiate_grouped_convolution(ITensor *input, ITensor *output, ConvolutionMethodHint conv_method_hint);
private:
unsigned int _conv_width; /**< Convolution width */
diff --git a/arm_compute/graph/nodes/FullyConnectedLayer.h b/arm_compute/graph/nodes/FullyConnectedLayer.h
index b05bc96c99..d31e060457 100644
--- a/arm_compute/graph/nodes/FullyConnectedLayer.h
+++ b/arm_compute/graph/nodes/FullyConnectedLayer.h
@@ -51,7 +51,6 @@ public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
// Inherited methods overriden:
private:
diff --git a/arm_compute/graph/nodes/NormalizationLayer.h b/arm_compute/graph/nodes/NormalizationLayer.h
index 52f67d2c31..02efd1cbeb 100644
--- a/arm_compute/graph/nodes/NormalizationLayer.h
+++ b/arm_compute/graph/nodes/NormalizationLayer.h
@@ -44,7 +44,6 @@ public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
private:
const NormalizationLayerInfo _norm_info; /**< Normalization layer information */
diff --git a/arm_compute/graph/nodes/PoolingLayer.h b/arm_compute/graph/nodes/PoolingLayer.h
index f07800a7b8..87b15d06cb 100644
--- a/arm_compute/graph/nodes/PoolingLayer.h
+++ b/arm_compute/graph/nodes/PoolingLayer.h
@@ -45,7 +45,6 @@ public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
private:
const PoolingLayerInfo _pool_info; /**< Pooling layer information */
diff --git a/arm_compute/graph/nodes/SoftmaxLayer.h b/arm_compute/graph/nodes/SoftmaxLayer.h
index 1515a0f28a..2e1bd98c8d 100644
--- a/arm_compute/graph/nodes/SoftmaxLayer.h
+++ b/arm_compute/graph/nodes/SoftmaxLayer.h
@@ -28,7 +28,6 @@
#include "arm_compute/graph/INode.h"
#include "arm_compute/graph/Tensor.h"
#include "arm_compute/graph/Types.h"
-
namespace arm_compute
{
namespace graph
@@ -39,7 +38,6 @@ class SoftmaxLayer : public INode
public:
// Inherited methods overriden:
std::unique_ptr<arm_compute::IFunction> instantiate_node(GraphContext &ctx, ITensor *input, ITensor *output) override;
- void print_info() override;
};
} // namespace graph