diff options
| author | David Monahan <David.Monahan@arm.com> | 2021-11-09 16:25:17 +0000 |
|---|---|---|
| committer | David Monahan <David.Monahan@arm.com> | 2021-11-09 17:33:06 +0000 |
| commit | 60c8d93f33c373e56beb06573f1e389e92de1e9b (patch) | |
| tree | 44c9d4c8304a6df6ef947a31df089136bbe61c58 | |
| parent | 0e1e45b57de7b963f1302b6a71f6816db9d34ceb (diff) | |
| download | armnn-60c8d93f33c373e56beb06573f1e389e92de1e9b.tar.gz | |
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 <David.Monahan@arm.com>
Change-Id: I4e7fbd3f2f40d349c39cdf0d7bfef1262144181b
| -rw-r--r-- | src/backends/backendsCommon/test/OptimizedNetworkTests.cpp | 12 |
1 files 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); } |