diff options
Diffstat (limited to 'src/backends')
-rw-r--r-- | src/backends/aclCommon/common.mk | 9 | ||||
-rw-r--r-- | src/backends/aclCommon/test/MemCopyTests.cpp | 11 | ||||
-rw-r--r-- | src/backends/cl/backend.mk | 12 | ||||
-rw-r--r-- | src/backends/common.mk | 9 | ||||
-rw-r--r-- | src/backends/neon/backend.mk | 11 | ||||
-rw-r--r-- | src/backends/reference/backend.mk | 9 | ||||
-rwxr-xr-x | src/backends/test/LayerTests.cpp | 2 |
7 files changed, 57 insertions, 6 deletions
diff --git a/src/backends/aclCommon/common.mk b/src/backends/aclCommon/common.mk index 9854f6fcb5..67ba01b1e4 100644 --- a/src/backends/aclCommon/common.mk +++ b/src/backends/aclCommon/common.mk @@ -14,4 +14,11 @@ COMMON_SOURCES := \ memory/BlobMemoryPool.cpp \ memory/OffsetLifetimeManager.cpp \ memory/OffsetMemoryPool.cpp \ - memory/PoolManager.cpp
\ No newline at end of file + memory/PoolManager.cpp + +# COMMON_TEST_SOURCES contains the list of files to be included +# in the Android unit test build (armnn-tests) and it is picked +# up by the Android.mk file in the root of ArmNN + +COMMON_TEST_SOURCES := \ + test/MemCopyTests.cpp diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp index 7e503b1cdb..d8b407d1bc 100644 --- a/src/backends/aclCommon/test/MemCopyTests.cpp +++ b/src/backends/aclCommon/test/MemCopyTests.cpp @@ -9,11 +9,12 @@ #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED #include <backends/aclCommon/test/MemCopyTestImpl.hpp> +#include <backends/cl/test/ClContextControlFixture.hpp> #endif #include <boost/test/unit_test.hpp> -BOOST_AUTO_TEST_SUITE(MemCopyTestSuite) +BOOST_AUTO_TEST_SUITE(MemCopyCommon) BOOST_AUTO_TEST_CASE(AclTypeConversions) { @@ -34,8 +35,12 @@ BOOST_AUTO_TEST_CASE(AclTypeConversions) BOOST_TEST(convertedshape[3] == 5); } +BOOST_AUTO_TEST_SUITE_END() + #if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED +BOOST_FIXTURE_TEST_SUITE(MemCopyClNeon, ClContextControlFixture) + BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndGpu) { LayerTestResult<float, 4> result = MemCopyTest<armnn::NeonWorkloadFactory, armnn::ClWorkloadFactory>(false); @@ -60,6 +65,6 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndNeonWithSubtensors) BOOST_TEST(CompareTensors(result.output, result.outputExpected)); } -#endif - BOOST_AUTO_TEST_SUITE_END() + +#endif
\ No newline at end of file diff --git a/src/backends/cl/backend.mk b/src/backends/cl/backend.mk index 205f7b5415..c549c01c28 100644 --- a/src/backends/cl/backend.mk +++ b/src/backends/cl/backend.mk @@ -37,3 +37,15 @@ BACKEND_SOURCES := \ workloads/ClSoftmaxFloatWorkload.cpp \ workloads/ClSoftmaxUint8Workload.cpp \ workloads/ClSubtractionWorkload.cpp + +# BACKEND_TEST_SOURCES contains the list of files to be included +# in the Android unit test build (armnn-tests) and it is picked +# up by the Android.mk file in the root of ArmNN + +BACKEND_TEST_SOURCES := \ + test/ClCreateWorkloadTests.cpp \ + test/ClLayerSupportTests.cpp \ + test/ClLayerTests.cpp \ + test/ClMemCopyTests.cpp \ + test/Fp16SupportTest.cpp \ + test/OpenClTimerTest.cpp diff --git a/src/backends/common.mk b/src/backends/common.mk index 2b649adcf5..b1583b987e 100644 --- a/src/backends/common.mk +++ b/src/backends/common.mk @@ -17,3 +17,12 @@ COMMON_SOURCES := \ StringMapping.cpp \ WorkloadData.cpp \ WorkloadFactory.cpp + +# COMMON_TEST_SOURCES contains the list of files to be included +# in the Android unit test build (armnn-tests) and it is picked +# up by the Android.mk file in the root of ArmNN + +COMMON_TEST_SOURCES := \ + test/WorkloadDataValidation.cpp \ + test/TensorCopyUtils.cpp \ + test/LayerTests.cpp diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk index 52e241f520..4cab9fbd71 100644 --- a/src/backends/neon/backend.mk +++ b/src/backends/neon/backend.mk @@ -34,3 +34,14 @@ BACKEND_SOURCES := \ workloads/NeonSoftmaxFloatWorkload.cpp \ workloads/NeonSoftmaxUint8Workload.cpp \ workloads/NeonSubtractionFloatWorkload.cpp + +# BACKEND_TEST_SOURCES contains the list of files to be included +# in the Android unit test build (armnn-tests) and it is picked +# up by the Android.mk file in the root of ArmNN + +BACKEND_TEST_SOURCES := \ + test/NeonCreateWorkloadTests.cpp \ + test/NeonLayerSupportTests.cpp \ + test/NeonLayerTests.cpp \ + test/NeonMemCopyTests.cpp \ + test/NeonTimerTest.cpp diff --git a/src/backends/reference/backend.mk b/src/backends/reference/backend.mk index 4403ea2d24..9ecb6d75b2 100644 --- a/src/backends/reference/backend.mk +++ b/src/backends/reference/backend.mk @@ -58,3 +58,12 @@ BACKEND_SOURCES := \ workloads/RefSplitterUint8Workload.cpp \ workloads/ResizeBilinear.cpp \ workloads/Softmax.cpp + +# BACKEND_TEST_SOURCES contains the list of files to be included +# in the Android unit test build (armnn-tests) and it is picked +# up by the Android.mk file in the root of ArmNN + +BACKEND_TEST_SOURCES := \ + test/RefCreateWorkloadTests.cpp \ + test/RefLayerSupportTests.cpp \ + test/RefLayerTests.cpp diff --git a/src/backends/test/LayerTests.cpp b/src/backends/test/LayerTests.cpp index 726cb7d26b..95f2a32297 100755 --- a/src/backends/test/LayerTests.cpp +++ b/src/backends/test/LayerTests.cpp @@ -34,8 +34,6 @@ #include "ConvertFp16ToFp32TestImpl.hpp" #include "ConvertFp32ToFp16TestImpl.hpp" -#include <backends/cl/test/ClContextControlFixture.hpp> - // 3-channel 16x8 image used as common input data for a number of Conv2d tests. static std::vector<float> ConvInput3x8x16({ 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, |