diff options
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/backendsCommon/test/DynamicBackendTests.hpp | 2 | ||||
-rw-r--r-- | src/backends/cl/ClBackend.hpp | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index cfcdf8e59c..f49c36e5b1 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -560,7 +560,7 @@ void CreateDynamicBackendObjectInvalidInterface6TestImpl() BackendVersion dynamicBackendVersion; CHECK_NOTHROW(dynamicBackendVersion = dynamicBackend->GetBackendVersion()); - CHECK((dynamicBackendVersion == BackendVersion({ 1, 0 }))); + CHECK((dynamicBackendVersion >= BackendVersion({ 1, 0 }))); IBackendInternalUniquePtr dynamicBackendInstance1; CHECK_THROWS_AS(dynamicBackendInstance1 = dynamicBackend->GetBackend(), RuntimeException); diff --git a/src/backends/cl/ClBackend.hpp b/src/backends/cl/ClBackend.hpp index db03cfeff0..c742c0b204 100644 --- a/src/backends/cl/ClBackend.hpp +++ b/src/backends/cl/ClBackend.hpp @@ -13,13 +13,14 @@ namespace armnn const BackendCapabilities gpuAccCapabilities("GpuAcc", { {"NonConstWeights", false}, - {"AsyncExecution", false} + {"AsyncExecution", false}, + {"ProtectedContentAllocation", true} }); class ClBackend : public IBackendInternal { public: - ClBackend() = default; + ClBackend() : m_EnableCustomAllocator(false) {}; ~ClBackend() = default; static const BackendId& GetIdStatic(); @@ -70,6 +71,18 @@ public: { return gpuAccCapabilities; }; + + virtual bool UseCustomMemoryAllocator(armnn::Optional<std::string&> errMsg) override + { + IgnoreUnused(errMsg); + + // Set flag to signal the backend to use a custom memory allocator + m_EnableCustomAllocator = true; + + return m_EnableCustomAllocator; + } + + bool m_EnableCustomAllocator; }; } // namespace armnn |