diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-10-11 17:39:30 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:53 +0100 |
| commit | 4423ac7fb7ec96c5fe88df2dd6de417c7d8b3709 (patch) | |
| tree | 550438a77405a0186195924ba71ce32f32fd5b55 /src/backends | |
| parent | b6cce4f906864b3bf21e00320b1add6d6bdd4f56 (diff) | |
| download | armnn-4423ac7fb7ec96c5fe88df2dd6de417c7d8b3709.tar.gz | |
IVGCVSW-2000: (Fix) Backend-specific unit tests not being executed
* Also disabled the Compute_ArmComputeCl/L2Normalization1dNhwc test as it
fails due to a bug in ACL
Change-Id: If1e36bc04f606e6568e6a13cc77f8f51f5834997
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/cl/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/cl/test/ClLayerTests.cpp | 3 | ||||
| -rw-r--r-- | src/backends/neon/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/reference/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/backends/test/LayerTests.cpp | 8 |
5 files changed, 5 insertions, 12 deletions
diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 795a7dc9d2..d365290a6c 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND armnnClBackendUnitTests_sources ClLayerTests.cpp ) -add_library(armnnClBackendUnitTests STATIC ${armnnClBackendUnitTests_sources}) +add_library(armnnClBackendUnitTests OBJECT ${armnnClBackendUnitTests_sources}) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index ab63ba4abb..cea7470b76 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -186,7 +186,8 @@ ARMNN_AUTO_TEST_CASE(L2Normalization2d, L2Normalization2dTest) ARMNN_AUTO_TEST_CASE(L2Normalization3d, L2Normalization3dTest) ARMNN_AUTO_TEST_CASE(L2Normalization4d, L2Normalization4dTest) -ARMNN_AUTO_TEST_CASE(L2Normalization1dNhwc, L2Normalization1dNhwcTest) +// NOTE: The following test hits a bug in ACL that makes it fail, keep it disabled until a patch is available in ACL +//ARMNN_AUTO_TEST_CASE(L2Normalization1dNhwc, L2Normalization1dNhwcTest) ARMNN_AUTO_TEST_CASE(L2Normalization2dNhwc, L2Normalization2dNhwcTest) ARMNN_AUTO_TEST_CASE(L2Normalization3dNhwc, L2Normalization3dNhwcTest) ARMNN_AUTO_TEST_CASE(L2Normalization4dNhwc, L2Normalization4dNhwcTest) diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index 82156f380b..87da01e9e2 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND armnnNeonBackendUnitTests_sources NeonLayerTests.cpp ) -add_library(armnnNeonBackendUnitTests STATIC ${armnnNeonBackendUnitTests_sources}) +add_library(armnnNeonBackendUnitTests OBJECT ${armnnNeonBackendUnitTests_sources}) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 8f86f86d39..511d747202 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND armnnRefBackendUnitTests_sources RefLayerTests.cpp ) -add_library(armnnRefBackendUnitTests STATIC ${armnnRefBackendUnitTests_sources}) +add_library(armnnRefBackendUnitTests OBJECT ${armnnRefBackendUnitTests_sources}) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
\ No newline at end of file diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp index d88db06411..d5f84f0920 100644 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/test/LayerTests.cpp @@ -3391,14 +3391,6 @@ LayerTestResult<float, 4> L2Normalization1dTest(armnn::IWorkloadFactory& workloa LayerTestResult<float, 4> L2Normalization1dNhwcTest(armnn::IWorkloadFactory& workloadFactory) { -#ifdef ARMCOMPUTECL_ENABLED - // Clear the CL cache before this test when using ACL - if (ClContextControlFixture::Instance()) - { - ClContextControlFixture::Instance()->m_ClContextControl.ClearClCache(); - } -#endif - // Width: 1 // Height: 1 // Channels: 10 |