diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2018-10-31 11:04:01 +0000 |
---|---|---|
committer | David Beck <david.beck@arm.com> | 2018-11-08 11:34:44 +0000 |
commit | 60578950322491e44b4203fe085c3230ead19c7a (patch) | |
tree | e68bd71cb7b90d66d69a3de25561e32a13dd4e17 /src/backends/cl | |
parent | db49a8880ba869627e884b5ba5245a3932de218d (diff) | |
download | armnn-60578950322491e44b4203fe085c3230ead19c7a.tar.gz |
IVGCVSW-1709: Clean up memory manager bodge
* Added quick workaround for the memory management errors in the
CL/Neon unit tests
Change-Id: I56250db462cdbdc1acc0a5824807d288fb0c1d11
Diffstat (limited to 'src/backends/cl')
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.cpp | 11 | ||||
-rw-r--r-- | src/backends/cl/ClWorkloadFactory.hpp | 4 | ||||
-rw-r--r-- | src/backends/cl/test/ClContextControlFixture.hpp | 16 |
3 files changed, 3 insertions, 28 deletions
diff --git a/src/backends/cl/ClWorkloadFactory.cpp b/src/backends/cl/ClWorkloadFactory.cpp index 43c147fb38..eece934ea3 100644 --- a/src/backends/cl/ClWorkloadFactory.cpp +++ b/src/backends/cl/ClWorkloadFactory.cpp @@ -19,8 +19,6 @@ #include <backendsCommon/MemCopyWorkload.hpp> -#include <aclCommon/memory/IPoolManager.hpp> - #include <cl/ClTensorHandle.hpp> #include <cl/workloads/ClWorkloads.hpp> #include <cl/workloads/ClWorkloadUtils.hpp> @@ -316,11 +314,6 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreatePad(const PadQueueDescriptor return MakeWorkload<ClPadWorkload>(descriptor, info); } -void ClWorkloadFactory::Finalize() -{ - m_MemoryManager.Finalize(); -} - void ClWorkloadFactory::Release() { m_MemoryManager.Release(); @@ -537,10 +530,6 @@ std::unique_ptr<IWorkload> ClWorkloadFactory::CreatePad(const PadQueueDescriptor return nullptr; } -void ClWorkloadFactory::Finalize() -{ -} - void ClWorkloadFactory::Release() { } diff --git a/src/backends/cl/ClWorkloadFactory.hpp b/src/backends/cl/ClWorkloadFactory.hpp index ff7e56c385..c45bc15839 100644 --- a/src/backends/cl/ClWorkloadFactory.hpp +++ b/src/backends/cl/ClWorkloadFactory.hpp @@ -8,7 +8,7 @@ #include <armnn/Optional.hpp> #include <backendsCommon/OutputHandler.hpp> -#include <aclCommon/memory/BaseMemoryManager.hpp> +#include <aclCommon/BaseMemoryManager.hpp> namespace armnn { @@ -126,8 +126,6 @@ public: virtual std::unique_ptr<IWorkload> CreatePad(const PadQueueDescriptor& descriptor, const WorkloadInfo& info) const override; - virtual void Finalize() override; - virtual void Release() override; virtual void Acquire() override; diff --git a/src/backends/cl/test/ClContextControlFixture.hpp b/src/backends/cl/test/ClContextControlFixture.hpp index 52e34147bb..0371c69a0b 100644 --- a/src/backends/cl/test/ClContextControlFixture.hpp +++ b/src/backends/cl/test/ClContextControlFixture.hpp @@ -6,26 +6,14 @@ #pragma once #include <cl/ClContextControl.hpp> +#include <backendsCommon/WorkloadFactory.hpp> template<bool ProfilingEnabled> struct ClContextControlFixtureBase { - static ClContextControlFixtureBase*& Instance() - { - static ClContextControlFixtureBase* s_Instance = nullptr; - return s_Instance; - } - // Initialising ClContextControl to ensure OpenCL is loaded correctly for each test case ClContextControlFixtureBase() - : m_ClContextControl(nullptr, ProfilingEnabled) - { - Instance() = this; - } - ~ClContextControlFixtureBase() - { - Instance() = nullptr; - } + : m_ClContextControl(nullptr, ProfilingEnabled) {} armnn::ClContextControl m_ClContextControl; }; |