From 3f26ef4f9a2d447adb324dd69aec7c49cf7905fc Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 23 Feb 2021 10:01:33 +0000 Subject: Add tensor related data structures for the new API Adds the following: - TensorDescriptor: which is responsible for holding the information needed to represent a tensor (e.g. shape, dimensions, etc) - Tensor: an aggreate object of a descriptor and a backing memory - TensorPack: A map of tensor that can be passed to operators as inputs/outputs Signed-off-by: Georgios Pinitas Change-Id: I02734ac6ad85700d91d6e73217b4637adbf5d177 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5260 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- src/cpu/CpuContext.cpp | 11 +++++++ src/cpu/CpuContext.h | 3 ++ src/cpu/CpuTensor.cpp | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/cpu/CpuTensor.h | 63 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+) create mode 100644 src/cpu/CpuTensor.cpp create mode 100644 src/cpu/CpuTensor.h (limited to 'src/cpu') diff --git a/src/cpu/CpuContext.cpp b/src/cpu/CpuContext.cpp index 6ff35602f3..d62c1b6310 100644 --- a/src/cpu/CpuContext.cpp +++ b/src/cpu/CpuContext.cpp @@ -24,6 +24,7 @@ #include "src/cpu/CpuContext.h" #include "arm_compute/core/CPP/CPPTypes.h" +#include "src/cpu/CpuTensor.h" #include "src/runtime/CPUUtils.h" #include @@ -185,5 +186,15 @@ AllocatorWrapper &CpuContext::allocator() { return _allocator; } + +ITensorV2 *CpuContext::create_tensor(const AclTensorDescriptor &desc, bool allocate) +{ + CpuTensor *tensor = new CpuTensor(this, desc); + if(tensor != nullptr && allocate) + { + tensor->allocate(); + } + return tensor; +} } // namespace cpu } // namespace arm_compute diff --git a/src/cpu/CpuContext.h b/src/cpu/CpuContext.h index 81bab97b8e..d2062e4bdd 100644 --- a/src/cpu/CpuContext.h +++ b/src/cpu/CpuContext.h @@ -67,6 +67,9 @@ public: */ AllocatorWrapper &allocator(); + // Inherrited methods overridden + ITensorV2 *create_tensor(const AclTensorDescriptor &desc, bool allocate) override; + private: AllocatorWrapper _allocator; CpuCapabilities _caps; diff --git a/src/cpu/CpuTensor.cpp b/src/cpu/CpuTensor.cpp new file mode 100644 index 0000000000..79dc812c58 --- /dev/null +++ b/src/cpu/CpuTensor.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2021 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. + */ +#include "src/cpu/CpuTensor.h" + +#include "src/common/utils/LegacySupport.h" + +namespace arm_compute +{ +namespace cpu +{ +CpuTensor::CpuTensor(IContext *ctx, const AclTensorDescriptor &desc) + : ITensorV2(ctx), _legacy_tensor() +{ + ARM_COMPUTE_ASSERT((ctx != nullptr) && (ctx->type() == Target::Cpu)); + _legacy_tensor = std::make_unique(); + _legacy_tensor->allocator()->init(arm_compute::detail::convert_to_legacy_tensor_info(desc)); +} + +void *CpuTensor::map() +{ + ARM_COMPUTE_ASSERT(_legacy_tensor.get() != nullptr); + + if(_legacy_tensor == nullptr) + { + ARM_COMPUTE_LOG_ERROR_ACL("[CpuTensor:map]: Backing tensor does not exist!"); + return nullptr; + } + return _legacy_tensor->buffer(); +} + +StatusCode CpuTensor::allocate() +{ + ARM_COMPUTE_ASSERT(_legacy_tensor.get() != nullptr); + + _legacy_tensor->allocator()->allocate(); + return StatusCode::Success; +} + +StatusCode CpuTensor::unmap() +{ + // No-op + return StatusCode::Success; +} + +StatusCode CpuTensor::import(void *handle, ImportMemoryType type) +{ + ARM_COMPUTE_ASSERT(_legacy_tensor.get() != nullptr); + ARM_COMPUTE_UNUSED(type); + + const auto st = _legacy_tensor->allocator()->import_memory(handle); + return bool(st) ? StatusCode::Success : StatusCode::RuntimeError; +} + +arm_compute::ITensor *CpuTensor::tensor() +{ + return _legacy_tensor.get(); +} +} // namespace cpu +} // namespace arm_compute diff --git a/src/cpu/CpuTensor.h b/src/cpu/CpuTensor.h new file mode 100644 index 0000000000..a46f1a26cb --- /dev/null +++ b/src/cpu/CpuTensor.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2021 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 SRC_CPU_CPUTENSOR_H +#define SRC_CPU_CPUTENSOR_H + +#include "src/common/ITensor.h" + +#include "arm_compute/runtime/Tensor.h" + +namespace arm_compute +{ +namespace cpu +{ +/** CPU tensor implementation class */ +class CpuTensor final : public ITensorV2 +{ +public: + /** Construct a new Cpu Tensor object + * + * @param[in] ctx Context to be used + * @param[in] desc Tensor descriptor + */ + CpuTensor(IContext *ctx, const AclTensorDescriptor &desc); + /** Allocates tensor + * + * @return StatusCode A status code + */ + StatusCode allocate(); + + // Inherrited functions overriden + void *map() override; + StatusCode unmap() override; + arm_compute::ITensor *tensor() override; + StatusCode import(void *handle, ImportMemoryType type) override; + +private: + std::unique_ptr _legacy_tensor; +}; +} // namespace cpu +} // namespace arm_compute + +#endif /* SRC_CPU_CPUTENSOR_H */ \ No newline at end of file -- cgit v1.2.1