From ed194b1fbec6627896c5c12f74460b9142b98f7d Mon Sep 17 00:00:00 2001 From: Michalis Spyrou 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 Reviewed-by: Anthony Barbier Reviewed-by: Pablo Tello --- arm_compute/graph/Error.h | 64 +++++++++++++++++++++++++++++++++++++++ arm_compute/graph/ITensorObject.h | 3 +- arm_compute/graph/SubTensor.h | 7 +++-- arm_compute/graph/Tensor.h | 7 +++-- 4 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 arm_compute/graph/Error.h (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/Error.h b/arm_compute/graph/Error.h new file mode 100644 index 0000000000..0c8ed266c0 --- /dev/null +++ b/arm_compute/graph/Error.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2017 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_ERROR_H__ +#define __ARM_COMPUTE_GRAPH_ERROR_H__ + +#include "arm_compute/graph/ITensorObject.h" + +namespace arm_compute +{ +namespace graph +{ +/** Evaluate if a tensor object is null. If the condition is true then an error message is printed and an exception thrown + * + * @param[in] function Function in which the error occurred. + * @param[in] file Name of the file where the error occurred. + * @param[in] line Line on which the error occurred. + * @param[in] tensor_object Tensor object to evaluate + * @param[in] tensor_objects (Optional) Further allowed tensor objects. + */ +template +void error_on_unallocated_tensor_object(const char *function, const char *file, int line, + const ITensorObject *tensor_object, Ts... tensor_objects) +{ + ARM_COMPUTE_UNUSED(function); + ARM_COMPUTE_UNUSED(file); + ARM_COMPUTE_UNUSED(line); + ARM_COMPUTE_UNUSED(tensor_object); + + ARM_COMPUTE_ERROR_ON_LOC(tensor_object == nullptr || tensor_object->tensor() == nullptr, function, file, line); + + const std::array tensor_objects_array{ { std::forward(tensor_objects)... } }; + ARM_COMPUTE_UNUSED(tensor_objects_array); + + ARM_COMPUTE_ERROR_ON_LOC(std::any_of(tensor_objects_array.begin(), tensor_objects_array.end(), [&](const ITensorObject * tensor_obj) + { + return (tensor_obj == nullptr || tensor_object->tensor() == nullptr); + }), + function, file, line); +} +#define ARM_COMPUTE_ERROR_ON_UNALLOCATED_TENSOR_OBJECT(...) ::arm_compute::graph::error_on_unallocated_tensor_object(__func__, __FILE__, __LINE__, __VA_ARGS__) +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GRAPH_ERROR_H__ */ diff --git a/arm_compute/graph/ITensorObject.h b/arm_compute/graph/ITensorObject.h index 61be2865c7..a922dd53fe 100644 --- a/arm_compute/graph/ITensorObject.h +++ b/arm_compute/graph/ITensorObject.h @@ -61,7 +61,8 @@ public: * * @return Tensor */ - virtual ITensor *tensor() = 0; + virtual ITensor *tensor() = 0; + virtual const ITensor *tensor() const = 0; /** Return the target that this tensor is pinned on * * @return Target of the tensor diff --git a/arm_compute/graph/SubTensor.h b/arm_compute/graph/SubTensor.h index 22a0a9e27f..72aa789274 100644 --- a/arm_compute/graph/SubTensor.h +++ b/arm_compute/graph/SubTensor.h @@ -72,9 +72,10 @@ public: bool call_accessor() override; bool has_accessor() const override; arm_compute::ITensor *set_target(TargetHint target) override; - arm_compute::ITensor *tensor() override; - TargetHint target() const override; - void allocate() override; + arm_compute::ITensor *tensor() override; + const arm_compute::ITensor *tensor() const override; + TargetHint target() const override; + void allocate() override; private: /** Instantiates a sub-tensor */ diff --git a/arm_compute/graph/Tensor.h b/arm_compute/graph/Tensor.h index 94822c2c1e..e5821dc812 100644 --- a/arm_compute/graph/Tensor.h +++ b/arm_compute/graph/Tensor.h @@ -107,9 +107,10 @@ public: bool call_accessor() override; bool has_accessor() const override; arm_compute::ITensor *set_target(TargetHint target) override; - arm_compute::ITensor *tensor() override; - TargetHint target() const override; - void allocate() override; + arm_compute::ITensor *tensor() override; + const arm_compute::ITensor *tensor() const override; + TargetHint target() const override; + void allocate() override; private: TargetHint _target; /**< Target that this tensor is pinned on */ -- cgit v1.2.1