commit 54e95723148c67d7f8b0697343971877969702c6
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Thu Oct 25 11:47:31 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Thu Oct 25 14:06:56 2018 +0100
tree 312871e93b6e2126ee831f9d61bd05c5ef37c3bb
parent 9c5db11cfebfff87d18252ab2edb3b0bef9207b8

IVGCVSW-2057: Remove ARMCOMPUTE(CL/NEON)_ENABLED and ARMCOMPUTENEON_ENABLED from src/armnnTfliteParser/test/ParserFlatBufferFixture.hpp

Change-Id: I85c720d37097e0c9a53dc473a7eac09f21deb847

src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp

diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
index e9cbb24..9c33b4f 100644
--- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
+++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp
@@ -15,6 +15,8 @@
 
 #include "armnnTfLiteParser/ITfLiteParser.hpp"
 
+#include <backends/BackendRegistry.hpp>
+
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
 
@@ -30,15 +32,12 @@
             : m_Parser(ITfLiteParser::Create()), m_NetworkIdentifier(-1)
     {
         armnn::IRuntime::CreationOptions options;
-        m_Runtimes.push_back(std::make_pair(armnn::IRuntime::Create(options), armnn::Compute::CpuRef));
 
-#if ARMCOMPUTENEON_ENABLED
-        m_Runtimes.push_back(std::make_pair(armnn::IRuntime::Create(options), armnn::Compute::CpuAcc));
-#endif
-
-#if ARMCOMPUTECL_ENABLED
-        m_Runtimes.push_back(std::make_pair(armnn::IRuntime::Create(options), armnn::Compute::GpuAcc));
-#endif
+        const armnn::BackendIdSet availableBackendIds = armnn::BackendRegistryInstance().GetBackendIds();
+        for (auto& backendId : availableBackendIds)
+        {
+            m_Runtimes.push_back(std::make_pair(armnn::IRuntime::Create(options), backendId));
+        }
     }
 
     std::vector<uint8_t> m_GraphBinary;