diff options
Diffstat (limited to 'src/backends/cl/test')
-rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/ClLayerSupportTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/ClLayerTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/cl/test/ClMemCopyTests.cpp | 40 | ||||
-rw-r--r-- | src/backends/cl/test/OpenClTimerTest.cpp | 2 |
5 files changed, 34 insertions, 14 deletions
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index 4a28205ade..4f53b921d0 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -11,7 +11,7 @@ #include <armnn/utility/PolymorphicDowncast.hpp> #include <armnn/backends/MemCopyWorkload.hpp> #include <armnnTestUtils/TensorCopyUtils.hpp> -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <armnnTestUtils/WorkloadTestUtils.hpp> #include <aclCommon/test/CreateWorkloadClNeon.hpp> diff --git a/src/backends/cl/test/ClLayerSupportTests.cpp b/src/backends/cl/test/ClLayerSupportTests.cpp index f3df594762..8d9a7f107d 100644 --- a/src/backends/cl/test/ClLayerSupportTests.cpp +++ b/src/backends/cl/test/ClLayerSupportTests.cpp @@ -8,7 +8,7 @@ #include <layers/ConvertFp16ToFp32Layer.hpp> #include <layers/ConvertFp32ToFp16Layer.hpp> #include <layers/MeanLayer.hpp> -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <armnn/backends/TensorHandle.hpp> #include <cl/ClWorkloadFactory.hpp> diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 967a7e446c..7f63e6326c 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -6,7 +6,7 @@ #include "ClContextControlFixture.hpp" #include "ClWorkloadFactoryHelper.hpp" -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <UnitTests.hpp> #include <cl/ClLayerSupport.hpp> diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp index 98b873fb6f..739ea7cdb3 100644 --- a/src/backends/cl/test/ClMemCopyTests.cpp +++ b/src/backends/cl/test/ClMemCopyTests.cpp @@ -3,22 +3,42 @@ // SPDX-License-Identifier: MIT // -#include "ClWorkloadFactoryHelper.hpp" - +#include <armnnTestUtils/LayerTestResult.hpp> +#include <armnnTestUtils/MemCopyTestImpl.hpp> +#include <armnnTestUtils/MockBackend.hpp> #include <cl/ClWorkloadFactory.hpp> -#include <aclCommon/test/MemCopyTestImpl.hpp> +#include <cl/ClBackend.hpp> +#include <doctest/doctest.h> + +namespace +{ -#include <reference/RefWorkloadFactory.hpp> -#include <reference/test/RefWorkloadFactoryHelper.hpp> +template <> +struct MemCopyTestHelper<armnn::ClWorkloadFactory> +{ + static armnn::IBackendInternal::IMemoryManagerSharedPtr GetMemoryManager() + { + armnn::ClBackend backend; + return backend.CreateMemoryManager(); + } -#include <doctest/doctest.h> + static armnn::ClWorkloadFactory GetFactory( + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ModelOptions& modelOptions = {}) + { + armnn::ClBackend backend; + return armnn::ClWorkloadFactory(armnn::PolymorphicPointerDowncast<armnn::ClMemoryManager>(memoryManager), + backend.CreateBackendSpecificModelContext(modelOptions)); + } +}; +} // namespace TEST_SUITE("ClMemCopy") { TEST_CASE("CopyBetweenCpuAndGpu") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::RefWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(false); + MemCopyTest<armnn::MockWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(false); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -27,7 +47,7 @@ TEST_CASE("CopyBetweenCpuAndGpu") TEST_CASE("CopyBetweenGpuAndCpu") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::ClWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(false); + MemCopyTest<armnn::ClWorkloadFactory, armnn::MockWorkloadFactory, armnn::DataType::Float32>(false); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -36,7 +56,7 @@ TEST_CASE("CopyBetweenGpuAndCpu") TEST_CASE("CopyBetweenCpuAndGpuWithSubtensors") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::RefWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(true); + MemCopyTest<armnn::MockWorkloadFactory, armnn::ClWorkloadFactory, armnn::DataType::Float32>(true); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -45,7 +65,7 @@ TEST_CASE("CopyBetweenCpuAndGpuWithSubtensors") TEST_CASE("CopyBetweenGpuAndCpuWithSubtensors") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::ClWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(true); + MemCopyTest<armnn::ClWorkloadFactory, armnn::MockWorkloadFactory, armnn::DataType::Float32>(true); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); diff --git a/src/backends/cl/test/OpenClTimerTest.cpp b/src/backends/cl/test/OpenClTimerTest.cpp index 3d273903bd..24a0afacef 100644 --- a/src/backends/cl/test/OpenClTimerTest.cpp +++ b/src/backends/cl/test/OpenClTimerTest.cpp @@ -7,7 +7,7 @@ #include "ClWorkloadFactoryHelper.hpp" -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <armnn/backends/TensorHandle.hpp> #include <armnn/backends/WorkloadFactory.hpp> |