From ed194b1fbec6627896c5c12f74460b9142b98f7d Mon Sep 17 00:00:00 2001
From: Michalis Spyrou <michalis.spyrou@arm.com>
Date: Tue, 31 Oct 2017 15:04:34 +0000
Subject: COMPMID-556 Add macro for checking graph's tensor object

Change-Id: I1de1c2932c9906b23b49e18bd82c173846d98723
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/93860
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
---
 src/graph/SubTensor.cpp                     | 5 +++++
 src/graph/Tensor.cpp                        | 5 +++++
 src/graph/nodes/ActivationLayer.cpp         | 4 ++--
 src/graph/nodes/BatchNormalizationLayer.cpp | 4 ++--
 src/graph/nodes/BranchLayer.cpp             | 4 ++--
 src/graph/nodes/ConvolutionLayer.cpp        | 4 ++--
 src/graph/nodes/DeQuantizationLayer.cpp     | 4 ++--
 src/graph/nodes/DepthConvertLayer.cpp       | 4 ++--
 src/graph/nodes/FlattenLayer.cpp            | 4 ++--
 src/graph/nodes/FloorLayer.cpp              | 4 ++--
 src/graph/nodes/FullyConnectedLayer.cpp     | 4 ++--
 src/graph/nodes/L2NormalizeLayer.cpp        | 4 ++--
 src/graph/nodes/NormalizationLayer.cpp      | 4 ++--
 src/graph/nodes/PoolingLayer.cpp            | 4 ++--
 src/graph/nodes/QuantizationLayer.cpp       | 4 ++--
 src/graph/nodes/ReshapeLayer.cpp            | 4 ++--
 src/graph/nodes/SoftmaxLayer.cpp            | 4 ++--
 17 files changed, 40 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/graph/SubTensor.cpp b/src/graph/SubTensor.cpp
index da8de956d7..2edeb3b1d4 100644
--- a/src/graph/SubTensor.cpp
+++ b/src/graph/SubTensor.cpp
@@ -88,6 +88,11 @@ arm_compute::ITensor *SubTensor::tensor()
     return _subtensor.get();
 }
 
+const arm_compute::ITensor *SubTensor::tensor() const
+{
+    return _subtensor.get();
+}
+
 TargetHint SubTensor::target() const
 {
     return _target;
diff --git a/src/graph/Tensor.cpp b/src/graph/Tensor.cpp
index f85fe27dbf..4db79e93ad 100644
--- a/src/graph/Tensor.cpp
+++ b/src/graph/Tensor.cpp
@@ -95,6 +95,11 @@ arm_compute::ITensor *Tensor::tensor()
     return _tensor.get();
 }
 
+const arm_compute::ITensor *Tensor::tensor() const
+{
+    return _tensor.get();
+}
+
 const TensorInfo &Tensor::info() const
 {
     return _info;
diff --git a/src/graph/nodes/ActivationLayer.cpp b/src/graph/nodes/ActivationLayer.cpp
index d3352140dc..54f30ef777 100644
--- a/src/graph/nodes/ActivationLayer.cpp
+++ b/src/graph/nodes/ActivationLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/ActivationLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -36,8 +37,7 @@ ActivationLayer::ActivationLayer(const ActivationLayerInfo activation_info)
 
 std::unique_ptr<arm_compute::IFunction> ActivationLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/BatchNormalizationLayer.cpp b/src/graph/nodes/BatchNormalizationLayer.cpp
index a433f39dc4..1fc83e4f69 100644
--- a/src/graph/nodes/BatchNormalizationLayer.cpp
+++ b/src/graph/nodes/BatchNormalizationLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/BatchNormalizationLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -31,8 +32,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> BatchNormalizationLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/BranchLayer.cpp b/src/graph/nodes/BranchLayer.cpp
index 28f58c6815..d062e4b791 100644
--- a/src/graph/nodes/BranchLayer.cpp
+++ b/src/graph/nodes/BranchLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/BranchLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/Graph.h"
 #include "arm_compute/graph/SubGraph.h"
 #include "arm_compute/graph/Tensor.h"
@@ -111,8 +112,7 @@ std::unique_ptr<arm_compute::IFunction> BranchLayer::instantiate_node(GraphConte
 {
     ARM_COMPUTE_ERROR_ON(_branch_merge_method != BranchMergeMethod::DEPTH_CONCATENATE);
     ARM_COMPUTE_UNUSED(_branch_merge_method);
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     // Create branch function
     auto func = arm_compute::support::cpp14::make_unique<BranchFunction>();
diff --git a/src/graph/nodes/ConvolutionLayer.cpp b/src/graph/nodes/ConvolutionLayer.cpp
index d3ab97fb2d..a7236fc78a 100644
--- a/src/graph/nodes/ConvolutionLayer.cpp
+++ b/src/graph/nodes/ConvolutionLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/ConvolutionLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h"
 #include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h"
 #include "arm_compute/runtime/IFunction.h"
@@ -175,8 +176,7 @@ private:
 
 std::unique_ptr<arm_compute::IFunction> ConvolutionLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/DeQuantizationLayer.cpp b/src/graph/nodes/DeQuantizationLayer.cpp
index 3760de6487..af9ecee157 100644
--- a/src/graph/nodes/DeQuantizationLayer.cpp
+++ b/src/graph/nodes/DeQuantizationLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/DequantizationLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 
@@ -30,8 +31,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> DequantizationLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     _target_hint              = ctx.hints().target_hint();
     arm_compute::ITensor *in  = input->tensor();
diff --git a/src/graph/nodes/DepthConvertLayer.cpp b/src/graph/nodes/DepthConvertLayer.cpp
index 62f308213e..9b328e7b3e 100644
--- a/src/graph/nodes/DepthConvertLayer.cpp
+++ b/src/graph/nodes/DepthConvertLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/DepthConvertLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 
@@ -35,8 +36,7 @@ DepthConvertLayer::DepthConvertLayer(const ConvertPolicy policy, uint32_t shift,
 
 std::unique_ptr<arm_compute::IFunction> DepthConvertLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     _target_hint              = ctx.hints().target_hint();
     arm_compute::ITensor *in  = input->tensor();
diff --git a/src/graph/nodes/FlattenLayer.cpp b/src/graph/nodes/FlattenLayer.cpp
index 1e42bd0cfa..66840f65f1 100644
--- a/src/graph/nodes/FlattenLayer.cpp
+++ b/src/graph/nodes/FlattenLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/FlattenLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -31,8 +32,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> FlattenLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     _target_hint              = ctx.hints().target_hint();
     arm_compute::ITensor *in  = input->tensor();
diff --git a/src/graph/nodes/FloorLayer.cpp b/src/graph/nodes/FloorLayer.cpp
index 21c82b8657..8750546ed9 100644
--- a/src/graph/nodes/FloorLayer.cpp
+++ b/src/graph/nodes/FloorLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/FloorLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -31,8 +32,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> FloorLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/FullyConnectedLayer.cpp b/src/graph/nodes/FullyConnectedLayer.cpp
index 39ed827631..41f679b4ec 100644
--- a/src/graph/nodes/FullyConnectedLayer.cpp
+++ b/src/graph/nodes/FullyConnectedLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/FullyConnectedLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -45,8 +46,7 @@ TensorShape calculate_fullyconnected_layer_output_shape(const TensorShape &input
 
 std::unique_ptr<arm_compute::IFunction> FullyConnectedLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/L2NormalizeLayer.cpp b/src/graph/nodes/L2NormalizeLayer.cpp
index bcc3b94178..9813ba4450 100644
--- a/src/graph/nodes/L2NormalizeLayer.cpp
+++ b/src/graph/nodes/L2NormalizeLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/L2NormalizeLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -36,8 +37,7 @@ L2NormalizeLayer::L2NormalizeLayer(unsigned int axis, float epsilon)
 
 std::unique_ptr<arm_compute::IFunction> L2NormalizeLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/NormalizationLayer.cpp b/src/graph/nodes/NormalizationLayer.cpp
index 5036231a36..a489329243 100644
--- a/src/graph/nodes/NormalizationLayer.cpp
+++ b/src/graph/nodes/NormalizationLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/NormalizationLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -36,8 +37,7 @@ NormalizationLayer::NormalizationLayer(const NormalizationLayerInfo norm_info)
 
 std::unique_ptr<arm_compute::IFunction> NormalizationLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/PoolingLayer.cpp b/src/graph/nodes/PoolingLayer.cpp
index 26df585e3b..2c151194f3 100644
--- a/src/graph/nodes/PoolingLayer.cpp
+++ b/src/graph/nodes/PoolingLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/PoolingLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -36,8 +37,7 @@ PoolingLayer::PoolingLayer(const PoolingLayerInfo pool_info)
 
 std::unique_ptr<arm_compute::IFunction> PoolingLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
diff --git a/src/graph/nodes/QuantizationLayer.cpp b/src/graph/nodes/QuantizationLayer.cpp
index 8e7dadbc93..c102f47633 100644
--- a/src/graph/nodes/QuantizationLayer.cpp
+++ b/src/graph/nodes/QuantizationLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/QuantizationLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 
@@ -30,8 +31,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> QuantizationLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     _target_hint              = ctx.hints().target_hint();
     arm_compute::ITensor *in  = input->tensor();
diff --git a/src/graph/nodes/ReshapeLayer.cpp b/src/graph/nodes/ReshapeLayer.cpp
index 3d1a679112..4967534879 100644
--- a/src/graph/nodes/ReshapeLayer.cpp
+++ b/src/graph/nodes/ReshapeLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/ReshapeLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -36,8 +37,7 @@ ReshapeLayer::ReshapeLayer(TensorShape shape)
 
 std::unique_ptr<arm_compute::IFunction> ReshapeLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     _target_hint              = ctx.hints().target_hint();
     arm_compute::ITensor *in  = input->tensor();
diff --git a/src/graph/nodes/SoftmaxLayer.cpp b/src/graph/nodes/SoftmaxLayer.cpp
index 62057c770c..7f2325b312 100644
--- a/src/graph/nodes/SoftmaxLayer.cpp
+++ b/src/graph/nodes/SoftmaxLayer.cpp
@@ -23,6 +23,7 @@
  */
 #include "arm_compute/graph/nodes/SoftmaxLayer.h"
 
+#include "arm_compute/graph/Error.h"
 #include "arm_compute/graph/NodeContext.h"
 #include "arm_compute/graph/OperationRegistry.h"
 #include "support/ToolchainSupport.h"
@@ -31,8 +32,7 @@ using namespace arm_compute::graph;
 
 std::unique_ptr<arm_compute::IFunction> SoftmaxLayer::instantiate_node(GraphContext &ctx, ITensorObject *input, ITensorObject *output)
 {
-    ARM_COMPUTE_ERROR_ON(input == nullptr || input->tensor() == nullptr);
-    ARM_COMPUTE_ERROR_ON(output == nullptr || output->tensor() == nullptr);
+    ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(input, output);
 
     arm_compute::ITensor *in  = input->tensor();
     arm_compute::ITensor *out = output->tensor();
-- 
cgit v1.2.1