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/c/AclContext.cpp | 11 ++-- src/c/AclTensor.cpp | 148 ++++++++++++++++++++++++++++++++++++++++++++++ src/c/AclTensorPack.cpp | 105 ++++++++++++++++++++++++++++++++ src/c/cl/AclOpenClExt.cpp | 29 +++++++++ 4 files changed, 287 insertions(+), 6 deletions(-) create mode 100644 src/c/AclTensor.cpp create mode 100644 src/c/AclTensorPack.cpp (limited to 'src/c') diff --git a/src/c/AclContext.cpp b/src/c/AclContext.cpp index e88995bcff..bff70f3baf 100644 --- a/src/c/AclContext.cpp +++ b/src/c/AclContext.cpp @@ -79,20 +79,20 @@ extern "C" AclStatus AclCreateContext(AclContext *ctx, { if(!is_target_valid(target)) { - ARM_COMPUTE_LOG_ERROR_ACL("Target is invalid"); + ARM_COMPUTE_LOG_ERROR_WITH_FUNCNAME_ACL("Target is invalid!"); return AclUnsupportedTarget; } if(options != nullptr && !are_context_options_valid(options)) { - ARM_COMPUTE_LOG_ERROR_ACL("Context options are invalid"); + ARM_COMPUTE_LOG_ERROR_WITH_FUNCNAME_ACL("Context options are invalid!"); return AclInvalidArgument; } auto acl_ctx = create_context(target, options); if(ctx == nullptr) { - ARM_COMPUTE_LOG_ERROR_ACL("Couldn't allocate internal resources for context creation"); + ARM_COMPUTE_LOG_ERROR_WITH_FUNCNAME_ACL("Couldn't allocate internal resources for context creation!"); return AclOutOfMemory; } *ctx = acl_ctx; @@ -106,13 +106,12 @@ extern "C" AclStatus AclDestroyContext(AclContext external_ctx) IContext *ctx = get_internal(external_ctx); - StatusCode status = StatusCode::Success; - status = detail::validate_internal_context(ctx); + StatusCode status = detail::validate_internal_context(ctx); ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); if(ctx->refcount() != 0) { - ARM_COMPUTE_LOG_ERROR_ACL("Context has references on it that haven't been released"); + ARM_COMPUTE_LOG_ERROR_WITH_FUNCNAME_ACL("Context has references on it that haven't been released!"); // TODO: Fix the refcount with callback when reaches 0 } diff --git a/src/c/AclTensor.cpp b/src/c/AclTensor.cpp new file mode 100644 index 0000000000..58b17ff70e --- /dev/null +++ b/src/c/AclTensor.cpp @@ -0,0 +1,148 @@ +/* + * 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 "arm_compute/AclEntrypoints.h" +#include "src/common/ITensor.h" +#include "src/common/utils/Macros.h" + +namespace +{ +/**< Maximum allowed dimensions by Compute Library */ +constexpr int32_t max_allowed_dims = 6; + +/** Check if a descriptor is valid + * + * @param desc Descriptor to validate + * + * @return true in case of success else false + */ +bool is_desc_valid(const AclTensorDescriptor &desc) +{ + if(desc.data_type > AclFloat32) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclCreateTensor]: Unknown data type!"); + return false; + } + if(desc.ndims > max_allowed_dims) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclCreateTensor]: Dimensions surpass the maximum allowed value!"); + return false; + } + if(desc.ndims > 0 && desc.shape == nullptr) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclCreateTensor]: Dimensions values are empty while dimensionality is > 0!"); + return false; + } + return true; +} +} // namespace + +extern "C" AclStatus AclCreateTensor(AclTensor *external_tensor, + AclContext external_ctx, + const AclTensorDescriptor *desc, + bool allocate) +{ + using namespace arm_compute; + + IContext *ctx = get_internal(external_ctx); + + StatusCode status = detail::validate_internal_context(ctx); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + if(desc == nullptr || !is_desc_valid(*desc)) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclCreateTensor]: Descriptor is invalid!"); + return AclInvalidArgument; + } + + auto tensor = ctx->create_tensor(*desc, allocate); + if(tensor == nullptr) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclCreateTensor]: Couldn't allocate internal resources for tensor creation!"); + return AclOutOfMemory; + } + *external_tensor = tensor; + + return AclSuccess; +} + +extern "C" AclStatus AclMapTensor(AclTensor external_tensor, void **handle) +{ + using namespace arm_compute; + + auto tensor = get_internal(external_tensor); + StatusCode status = detail::validate_internal_tensor(tensor); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + if(handle == nullptr) + { + ARM_COMPUTE_LOG_ERROR_ACL("[AclMapTensor]: Handle object is nullptr!"); + return AclInvalidArgument; + } + + *handle = tensor->map(); + + return AclSuccess; +} + +extern "C" AclStatus AclUnmapTensor(AclTensor external_tensor, void *handle) +{ + ARM_COMPUTE_UNUSED(handle); + + using namespace arm_compute; + + auto tensor = get_internal(external_tensor); + StatusCode status = detail::validate_internal_tensor(tensor); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + status = tensor->unmap(); + return AclSuccess; +} + +extern "C" AclStatus AclTensorImport(AclTensor external_tensor, void *handle, AclImportMemoryType type) +{ + using namespace arm_compute; + + auto tensor = get_internal(external_tensor); + StatusCode status = detail::validate_internal_tensor(tensor); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + status = tensor->import(handle, utils::as_enum(type)); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + return AclSuccess; +} + +extern "C" AclStatus AclDestroyTensor(AclTensor external_tensor) +{ + using namespace arm_compute; + + auto tensor = get_internal(external_tensor); + + StatusCode status = detail::validate_internal_tensor(tensor); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + delete tensor; + + return AclSuccess; +} diff --git a/src/c/AclTensorPack.cpp b/src/c/AclTensorPack.cpp new file mode 100644 index 0000000000..6700ef464c --- /dev/null +++ b/src/c/AclTensorPack.cpp @@ -0,0 +1,105 @@ +/* + * 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 "arm_compute/AclEntrypoints.h" +#include "src/common/ITensor.h" +#include "src/common/TensorPack.h" +#include "src/common/utils/Macros.h" + +namespace +{ +using namespace arm_compute; +StatusCode PackTensorInternal(TensorPack &pack, AclTensor external_tensor, int32_t slot_id) +{ + auto status = StatusCode::Success; + auto tensor = get_internal(external_tensor); + + status = detail::validate_internal_tensor(tensor); + + if(status != StatusCode::Success) + { + return status; + } + + pack.add_tensor(tensor, slot_id); + + return status; +} +} // namespace + +extern "C" AclStatus AclCreateTensorPack(AclTensorPack *external_pack, AclContext external_ctx) +{ + using namespace arm_compute; + + IContext *ctx = get_internal(external_ctx); + + const StatusCode status = detail::validate_internal_context(ctx); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + auto pack = new TensorPack(ctx); + if(pack == nullptr) + { + ARM_COMPUTE_LOG_ERROR_WITH_FUNCNAME_ACL("Couldn't allocate internal resources!"); + return AclOutOfMemory; + } + *external_pack = pack; + + return AclSuccess; +} + +extern "C" AclStatus AclPackTensor(AclTensorPack external_pack, AclTensor external_tensor, int32_t slot_id) +{ + using namespace arm_compute; + + auto pack = get_internal(external_pack); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(detail::validate_internal_pack(pack)); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(PackTensorInternal(*pack, external_tensor, slot_id)); + return AclStatus::AclSuccess; +} + +extern "C" AclStatus AclPackTensors(AclTensorPack external_pack, AclTensor *external_tensors, int32_t *slot_ids, size_t num_tensors) +{ + using namespace arm_compute; + + auto pack = get_internal(external_pack); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(detail::validate_internal_pack(pack)); + + for(unsigned i = 0; i < num_tensors; ++i) + { + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(PackTensorInternal(*pack, external_tensors[i], slot_ids[i])); + } + return AclStatus::AclSuccess; +} + +extern "C" AclStatus AclDestroyTensorPack(AclTensorPack external_pack) +{ + using namespace arm_compute; + + auto pack = get_internal(external_pack); + StatusCode status = detail::validate_internal_pack(pack); + ARM_COMPUTE_RETURN_CENUM_ON_FAILURE(status); + + delete pack; + + return AclSuccess; +} diff --git a/src/c/cl/AclOpenClExt.cpp b/src/c/cl/AclOpenClExt.cpp index 5f2bb47c16..a144f97f55 100644 --- a/src/c/cl/AclOpenClExt.cpp +++ b/src/c/cl/AclOpenClExt.cpp @@ -23,9 +23,12 @@ */ #include "arm_compute/AclOpenClExt.h" +#include "src/common/ITensor.h" #include "src/common/Types.h" #include "src/gpu/cl/ClContext.h" +#include "arm_compute/core/CL/ICLTensor.h" + #include "support/Cast.h" extern "C" AclStatus AclGetClContext(AclContext external_ctx, cl_context *opencl_context) @@ -79,5 +82,31 @@ extern "C" AclStatus AclSetClContext(AclContext external_ctx, cl_context opencl_ return AclStatus::AclRuntimeError; } + return AclStatus::AclSuccess; +} + +extern "C" AclStatus AclGetClMem(AclTensor external_tensor, cl_mem *opencl_mem) +{ + using namespace arm_compute; + ITensorV2 *tensor = get_internal(external_tensor); + + if(detail::validate_internal_tensor(tensor) != StatusCode::Success) + { + return AclStatus::AclInvalidArgument; + } + + if(tensor->header.ctx->type() != Target::GpuOcl) + { + return AclStatus::AclInvalidTarget; + } + + if(opencl_mem == nullptr) + { + return AclStatus::AclInvalidArgument; + } + + auto cl_tensor = utils::cast::polymorphic_downcast(tensor->tensor()); + *opencl_mem = cl_tensor->cl_buffer().get(); + return AclStatus::AclSuccess; } \ No newline at end of file -- cgit v1.2.1