diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-03 15:11:16 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-04-09 16:51:03 +0000 |
commit | 4d0351cf322df51baa5a445f637008992aa37809 (patch) | |
tree | 411e748a6bb5b64920780382e0613596dcd55ccf /src/runtime | |
parent | a4bba9c594c4022c9f85192bb8fd3593ad1a8d3c (diff) | |
download | ComputeLibrary-4d0351cf322df51baa5a445f637008992aa37809.tar.gz |
COMPMID-2057: Implement and test import memory interfaces.
Change-Id: I1559bea47ae6403177d248e2f7be47d5f1a6513f
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/956
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Diffstat (limited to 'src/runtime')
-rw-r--r-- | src/runtime/CL/CLTensorAllocator.cpp | 6 | ||||
-rw-r--r-- | src/runtime/TensorAllocator.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/runtime/CL/CLTensorAllocator.cpp b/src/runtime/CL/CLTensorAllocator.cpp index 0307498335..2ce64551ae 100644 --- a/src/runtime/CL/CLTensorAllocator.cpp +++ b/src/runtime/CL/CLTensorAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -101,10 +101,10 @@ void CLTensorAllocator::free() info().set_is_resizable(true); } -arm_compute::Status CLTensorAllocator::import_memory(cl::Buffer buffer) +Status CLTensorAllocator::import_memory(cl::Buffer buffer) { ARM_COMPUTE_RETURN_ERROR_ON(buffer.get() == nullptr); - ARM_COMPUTE_RETURN_ERROR_ON(buffer.getInfo<CL_MEM_SIZE>() == 0); + ARM_COMPUTE_RETURN_ERROR_ON(buffer.getInfo<CL_MEM_SIZE>() < info().total_size()); ARM_COMPUTE_RETURN_ERROR_ON(buffer.getInfo<CL_MEM_CONTEXT>().get() != CLScheduler::get().context().get()); ARM_COMPUTE_RETURN_ERROR_ON(_associated_memory_group != nullptr); diff --git a/src/runtime/TensorAllocator.cpp b/src/runtime/TensorAllocator.cpp index 38edb8ba03..0612d751f0 100644 --- a/src/runtime/TensorAllocator.cpp +++ b/src/runtime/TensorAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 ARM Limited. + * Copyright (c) 2016-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -149,11 +149,11 @@ void TensorAllocator::free() info().set_is_resizable(true); } -arm_compute::Status TensorAllocator::import_memory(void *memory, size_t size) +Status TensorAllocator::import_memory(void *memory) { ARM_COMPUTE_RETURN_ERROR_ON(memory == nullptr); - ARM_COMPUTE_RETURN_ERROR_ON(size == 0); ARM_COMPUTE_RETURN_ERROR_ON(_associated_memory_group != nullptr); + ARM_COMPUTE_RETURN_ERROR_ON(alignment() != 0 && !arm_compute::utility::check_aligned(memory, alignment())); _memory.set_owned_region(support::cpp14::make_unique<MemoryRegion>(memory, info().total_size())); info().set_is_resizable(false); |