diff options
Diffstat (limited to 'arm_compute/runtime')
-rw-r--r-- | arm_compute/runtime/Memory.h | 83 | ||||
-rw-r--r-- | arm_compute/runtime/MemoryGroupBase.h | 1 | ||||
-rw-r--r-- | arm_compute/runtime/TensorAllocator.h | 16 |
3 files changed, 99 insertions, 1 deletions
diff --git a/arm_compute/runtime/Memory.h b/arm_compute/runtime/Memory.h new file mode 100644 index 0000000000..98bbb70239 --- /dev/null +++ b/arm_compute/runtime/Memory.h @@ -0,0 +1,83 @@ +/* + * 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_MEMORY_H__ +#define __ARM_COMPUTE_MEMORY_H__ + +#include <cstddef> +#include <memory> + +namespace arm_compute +{ +/** CPU implementation of memory object */ +class Memory +{ +public: + /** Default Constructor */ + Memory(); + /** Default Constructor + * + * @note Ownership of the memory is transferred to this object + * + * @param[in] memory Memory to be imported + */ + Memory(std::shared_ptr<uint8_t> memory); + /** Default Constructor + * + * @note Ownership of the memory is not transferred to this object. + * Thus management (allocate/free) should be done by the client. + * + * @param[in] memory Memory to be imported + */ + Memory(uint8_t *memory); + /** Allow instances of this class to be copied */ + Memory(const Memory &) = default; + /** Allow instances of this class to be copy assigned */ + Memory &operator=(const Memory &) = default; + /** Allow instances of this class to be moved */ + Memory(Memory &&) noexcept = default; + /** Allow instances of this class to be move assigned */ + Memory &operator=(Memory &&) noexcept = default; + + /** Returns the pointer to the allocated data. + * + * @return Pointer to the allocated data + */ + uint8_t *buffer(); + /** Returns the pointer to the allocated data. + * + * @return Pointer to the allocated data + */ + uint8_t *buffer() const; + /** Handle of internal memory + * + * @return Handle of memory + */ + uint8_t **handle(); + +private: + uint8_t *_memory; + std::shared_ptr<uint8_t> _memory_owned; +}; +} +#endif /* __ARM_COMPUTE_MEMORY_H__ */ diff --git a/arm_compute/runtime/MemoryGroupBase.h b/arm_compute/runtime/MemoryGroupBase.h index ab8acb3494..19e9834923 100644 --- a/arm_compute/runtime/MemoryGroupBase.h +++ b/arm_compute/runtime/MemoryGroupBase.h @@ -26,6 +26,7 @@ #include "arm_compute/runtime/IMemoryGroup.h" +#include "arm_compute/core/Error.h" #include "arm_compute/runtime/IMemoryManager.h" #include "arm_compute/runtime/IMemoryPool.h" diff --git a/arm_compute/runtime/TensorAllocator.h b/arm_compute/runtime/TensorAllocator.h index 40704c0a17..5e00cc0cc7 100644 --- a/arm_compute/runtime/TensorAllocator.h +++ b/arm_compute/runtime/TensorAllocator.h @@ -25,6 +25,7 @@ #define __ARM_COMPUTE_TENSORALLOCATOR_H__ #include "arm_compute/runtime/ITensorAllocator.h" +#include "arm_compute/runtime/Memory.h" #include <cstdint> #include <memory> @@ -86,6 +87,19 @@ public: * */ void free() override; + /** Import an existing memory as a tensor's backing memory + * + * @warning If the tensor is flagged to be managed by a memory manager, + * this call will lead to an error. + * @warning Ownership of memory depends on the way the @ref Memory object was constructed + * @note Calling free on a tensor with imported memory will just clear + * the internal pointer value. + * + * @param[in] memory Memory to import + * + * @return error status + */ + arm_compute::Error import_memory(Memory memory); /** Associates the tensor with a memory group * * @param[in] associated_memory_group Memory group to associate the tensor with @@ -104,7 +118,7 @@ protected: private: MemoryGroup *_associated_memory_group; /**< Registered memory manager */ - uint8_t *_buffer; /**< CPU memory allocation. */ + Memory _memory; /**< CPU memory */ Tensor *_owner; /**< Owner of the allocator */ }; } |