From 60c8d93f33c373e56beb06573f1e389e92de1e9b Mon Sep 17 00:00:00 2001 From: David Monahan Date: Tue, 9 Nov 2021 16:25:17 +0000 Subject: IVGCVSW-6558 Fix the failing OptimisedNetworkTests * With the new Memory Management updates input tensors should now match the backend of the layer they are attached to. Updated the test to reflect this. Signed-off-by: David Monahan Change-Id: I4e7fbd3f2f40d349c39cdf0d7bfef1262144181b --- src/backends/backendsCommon/test/OptimizedNetworkTests.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp index 6eecaabf55..4b932c78f8 100644 --- a/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp +++ b/src/backends/backendsCommon/test/OptimizedNetworkTests.cpp @@ -337,7 +337,11 @@ TEST_CASE("OptimizeValidateWorkloadsDuplicateComputeDeviceWithFallback") // the other layers are supported by CpuRef. // If neither NEON, nor CL is enabled, all layers are supported by CpuRef. #if defined(ARMCOMPUTENEON_ENABLED) - if (layer->GetType() == armnn::LayerType::Output) + if (layer->GetType() == armnn::LayerType::Input) + { + CHECK(layer->GetBackendId() == armnn::Compute::CpuRef); + } + else if (layer->GetType() == armnn::LayerType::Output) { CHECK(layer->GetBackendId() == armnn::Compute::CpuAcc); } @@ -346,7 +350,11 @@ TEST_CASE("OptimizeValidateWorkloadsDuplicateComputeDeviceWithFallback") CHECK(layer->GetBackendId() == armnn::Compute::CpuRef); } #elif defined(ARMCOMPUTECL_ENABLED) - if (layer->GetType() == armnn::LayerType::Input || layer->GetType() == armnn::LayerType::Output) + if (layer->GetType() == armnn::LayerType::Input) + { + CHECK(layer->GetBackendId() == armnn::Compute::CpuRef); + } + else if (layer->GetType() == armnn::LayerType::Output) { CHECK(layer->GetBackendId() == armnn::Compute::GpuAcc); } -- cgit v1.2.1