From 60a20fb62c992c4c6369bb7f532957f3e151f3d8 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Mon, 9 Dec 2019 17:24:41 +0000 Subject: IVGCVSW-4212 Example of standalone dynamic reference backend * Add example to build dynamic reference backend * Add functions to clear dynamic backends * Fix the error when dynamic backend is not deregistered * Add DYARMNN_DYNAMIC_BACKEND_ENABLED to check disable empty dynamic backend when dynamic backend is enabled Signed-off-by: Narumol Prangnawarat Change-Id: I1ef3a3f10ed6ca5ec18d0af04b007fc3bc71a3cb --- src/backends/backendsCommon/test/DynamicBackendTests.cpp | 2 ++ src/backends/backendsCommon/test/DynamicBackendTests.hpp | 4 ++++ src/backends/backendsCommon/test/OptimizationViewsTests.cpp | 10 ++-------- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/backends/backendsCommon/test') diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.cpp b/src/backends/backendsCommon/test/DynamicBackendTests.cpp index c6606be9ff..40e063d8c4 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.cpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.cpp @@ -55,7 +55,9 @@ ARMNN_SIMPLE_TEST_CASE(RegisterMultipleDynamicBackends, RegisterMultipleDynamicB ARMNN_SIMPLE_TEST_CASE(RegisterMultipleInvalidDynamicBackends, RegisterMultipleInvalidDynamicBackendsTestImpl); ARMNN_SIMPLE_TEST_CASE(RegisterMixedDynamicBackends, RegisterMixedDynamicBackendsTestImpl); +#if !defined(ARMNN_DYNAMIC_BACKEND_ENABLED) ARMNN_SIMPLE_TEST_CASE(RuntimeEmpty, RuntimeEmptyTestImpl); +#endif ARMNN_SIMPLE_TEST_CASE(RuntimeDynamicBackends, RuntimeDynamicBackendsTestImpl); ARMNN_SIMPLE_TEST_CASE(RuntimeDuplicateDynamicBackends, RuntimeDuplicateDynamicBackendsTestImpl); ARMNN_SIMPLE_TEST_CASE(RuntimeInvalidDynamicBackends, RuntimeInvalidDynamicBackendsTestImpl); diff --git a/src/backends/backendsCommon/test/DynamicBackendTests.hpp b/src/backends/backendsCommon/test/DynamicBackendTests.hpp index 561578e841..4238ef6f7d 100644 --- a/src/backends/backendsCommon/test/DynamicBackendTests.hpp +++ b/src/backends/backendsCommon/test/DynamicBackendTests.hpp @@ -1198,6 +1198,8 @@ void RegisterMixedDynamicBackendsTestImpl() } } +#if !defined(ARMNN_DYNAMIC_BACKEND_ENABLED) + void RuntimeEmptyTestImpl() { using namespace armnn; @@ -1218,6 +1220,8 @@ void RuntimeEmptyTestImpl() BOOST_TEST(backendRegistry.Size() == 0); } +#endif + void RuntimeDynamicBackendsTestImpl() { using namespace armnn; diff --git a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp index 5474f5ddac..639e1fd59e 100644 --- a/src/backends/backendsCommon/test/OptimizationViewsTests.cpp +++ b/src/backends/backendsCommon/test/OptimizationViewsTests.cpp @@ -25,14 +25,8 @@ void CheckLayers(Graph& graph) { case LayerType::Input: ++m_inputLayerCount; - if (layer->GetGuid() == profiling::ProfilingGuid(0)) - { - BOOST_TEST(layer->GetName() == "inLayer0"); - } - else if (layer->GetGuid() == profiling::ProfilingGuid(1)) - { - BOOST_TEST(layer->GetName() == "inLayer1"); - } + BOOST_TEST((layer->GetName() == std::string("inLayer0") || + layer->GetName() == std::string("inLayer1"))); break; // The Addition layer should become a PreCompiled Layer after Optimisation case LayerType::PreCompiled: -- cgit v1.2.1