From 54e95723148c67d7f8b0697343971877969702c6 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Thu, 25 Oct 2018 11:47:31 +0100 Subject: IVGCVSW-2057: Remove ARMCOMPUTE(CL/NEON)_ENABLED and ARMCOMPUTENEON_ENABLED from src/armnnTfliteParser/test/ParserFlatBufferFixture.hpp Change-Id: I85c720d37097e0c9a53dc473a7eac09f21deb847 --- src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp index e9cbb24604..9c33b4f254 100644 --- a/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp +++ b/src/armnnTfLiteParser/test/ParserFlatbuffersFixture.hpp @@ -15,6 +15,8 @@ #include "armnnTfLiteParser/ITfLiteParser.hpp" +#include + #include "flatbuffers/idl.h" #include "flatbuffers/util.h" @@ -30,15 +32,12 @@ struct ParserFlatbuffersFixture : 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 m_GraphBinary; -- cgit v1.2.1