diff options
Diffstat (limited to 'src/runtime/PoolManager.cpp')
-rw-r--r-- | src/runtime/PoolManager.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/runtime/PoolManager.cpp b/src/runtime/PoolManager.cpp index 19ed2577dc..7fb9bd8000 100644 --- a/src/runtime/PoolManager.cpp +++ b/src/runtime/PoolManager.cpp @@ -25,15 +25,13 @@ #include "arm_compute/core/Error.h" #include "arm_compute/runtime/IMemoryPool.h" -#include "support/MemorySupport.h" #include <algorithm> #include <list> using namespace arm_compute; -PoolManager::PoolManager() - : _free_pools(), _occupied_pools(), _sem(), _mtx() +PoolManager::PoolManager() : _free_pools(), _occupied_pools(), _sem(), _mtx() { } @@ -53,10 +51,8 @@ void PoolManager::unlock_pool(IMemoryPool *pool) ARM_COMPUTE_ERROR_ON_MSG(_free_pools.empty() && _occupied_pools.empty(), "Haven't setup any pools!"); arm_compute::lock_guard<arm_compute::Mutex> lock(_mtx); - auto it = std::find_if(std::begin(_occupied_pools), std::end(_occupied_pools), [pool](const std::unique_ptr<IMemoryPool> &pool_it) - { - return pool_it.get() == pool; - }); + auto it = std::find_if(std::begin(_occupied_pools), std::end(_occupied_pools), + [pool](const std::unique_ptr<IMemoryPool> &pool_it) { return pool_it.get() == pool; }); ARM_COMPUTE_ERROR_ON_MSG(it == std::end(_occupied_pools), "Pool to be unlocked couldn't be found!"); _free_pools.splice(std::begin(_free_pools), _occupied_pools, it); _sem->signal(); @@ -71,7 +67,7 @@ void PoolManager::register_pool(std::unique_ptr<IMemoryPool> pool) _free_pools.push_front(std::move(pool)); // Update semaphore - _sem = arm_compute::support::cpp14::make_unique<arm_compute::Semaphore>(_free_pools.size()); + _sem = std::make_unique<arm_compute::Semaphore>(_free_pools.size()); } std::unique_ptr<IMemoryPool> PoolManager::release_pool() @@ -79,14 +75,14 @@ std::unique_ptr<IMemoryPool> PoolManager::release_pool() arm_compute::lock_guard<arm_compute::Mutex> lock(_mtx); ARM_COMPUTE_ERROR_ON_MSG(!_occupied_pools.empty(), "All pools should be free in order to release one!"); - if(!_free_pools.empty()) + if (!_free_pools.empty()) { std::unique_ptr<IMemoryPool> pool = std::move(_free_pools.front()); ARM_COMPUTE_ERROR_ON(_free_pools.front() != nullptr); _free_pools.pop_front(); // Update semaphore - _sem = arm_compute::support::cpp14::make_unique<arm_compute::Semaphore>(_free_pools.size()); + _sem = std::make_unique<arm_compute::Semaphore>(_free_pools.size()); return pool; } |