diff options
| -rw-r--r-- | include/armnnTestUtils/MockWorkloadFactoryHelper.hpp | 41 | ||||
| -rwxr-xr-x | src/armnnTestUtils/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/armnnTestUtils/UnitTests.hpp | 6 | ||||
| -rw-r--r-- | src/backends/neon/NeonTimer.cpp | 3 | ||||
| -rw-r--r-- | src/backends/reference/test/RefWorkloadFactoryHelper.hpp | 4 |
5 files changed, 9 insertions, 48 deletions
diff --git a/include/armnnTestUtils/MockWorkloadFactoryHelper.hpp b/include/armnnTestUtils/MockWorkloadFactoryHelper.hpp deleted file mode 100644 index e9f2b2f6cf..0000000000 --- a/include/armnnTestUtils/MockWorkloadFactoryHelper.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// -// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. -// SPDX-License-Identifier: MIT -// - -#pragma once - -#include "MockBackend.hpp" -#include "MockTensorHandleFactory.hpp" -#include <backendsCommon/test/WorkloadFactoryHelper.hpp> - -namespace -{ - -template <> -struct WorkloadFactoryHelper<armnn::MockWorkloadFactory> -{ - static armnn::IBackendInternal::IMemoryManagerSharedPtr GetMemoryManager() - { - armnn::MockBackend backend; - return backend.CreateMemoryManager(); - } - - static armnn::MockWorkloadFactory - GetFactory(const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager = nullptr) - { - IgnoreUnused(memoryManager); - return armnn::MockWorkloadFactory(); - } - - static armnn::MockTensorHandleFactory - GetTensorHandleFactory(const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager = nullptr) - { - - return armnn::MockTensorHandleFactory(std::static_pointer_cast<armnn::MockMemoryManager>(memoryManager)); - } -}; - -using MockWorkloadFactoryHelper = WorkloadFactoryHelper<armnn::MockWorkloadFactory>; - -} // anonymous namespace diff --git a/src/armnnTestUtils/CMakeLists.txt b/src/armnnTestUtils/CMakeLists.txt index e33fed77d7..061dd90d3d 100755 --- a/src/armnnTestUtils/CMakeLists.txt +++ b/src/armnnTestUtils/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND armnnTestUtils_sources ../../include/armnnTestUtils/MockBackend.hpp ../../include/armnnTestUtils/MockMemoryManager.hpp ../../include/armnnTestUtils/MockTensorHandle.hpp - ../../include/armnnTestUtils/MockWorkloadFactoryHelper.hpp ../../include/armnnTestUtils/PredicateResult.hpp ../../include/armnnTestUtils/TensorCopyUtils.hpp ../../include/armnnTestUtils/WorkloadTestUtils.hpp @@ -57,4 +56,4 @@ install(TARGETS armnnTestUtils ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -add_library(Armnn::armnnTestUtils ALIAS armnnTestUtils)
\ No newline at end of file +add_library(Armnn::armnnTestUtils ALIAS armnnTestUtils) diff --git a/src/armnnTestUtils/UnitTests.hpp b/src/armnnTestUtils/UnitTests.hpp index f560720c9b..71324dbf81 100644 --- a/src/armnnTestUtils/UnitTests.hpp +++ b/src/armnnTestUtils/UnitTests.hpp @@ -155,11 +155,11 @@ void CompareRefTestFunctionUsingTensorHandleFactory(const char* testName, TFuncP { auto memoryManager = WorkloadFactoryHelper<FactoryType>::GetMemoryManager(); FactoryType workloadFactory = WorkloadFactoryHelper<FactoryType>::GetFactory(memoryManager); + auto tensorHandleFactory = WorkloadFactoryHelper<FactoryType>::GetTensorHandleFactory(memoryManager); armnn::RefWorkloadFactory refWorkloadFactory; - auto tensorHandleFactory = WorkloadFactoryHelper<FactoryType>::GetTensorHandleFactory(memoryManager); - auto refTensorHandleFactory = - RefWorkloadFactoryHelper::GetTensorHandleFactory(memoryManager); + auto refMemoryManager = WorkloadFactoryHelper<armnn::RefWorkloadFactory>::GetMemoryManager(); + auto refTensorHandleFactory = RefWorkloadFactoryHelper::GetTensorHandleFactory(refMemoryManager); auto testResult = (*testFunction)( workloadFactory, memoryManager, refWorkloadFactory, tensorHandleFactory, refTensorHandleFactory, args...); diff --git a/src/backends/neon/NeonTimer.cpp b/src/backends/neon/NeonTimer.cpp index 5cce0511ab..a7d3032b13 100644 --- a/src/backends/neon/NeonTimer.cpp +++ b/src/backends/neon/NeonTimer.cpp @@ -7,6 +7,7 @@ #include "NeonInterceptorScheduler.hpp" #include <armnn/utility/Assert.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> #include <memory> @@ -29,7 +30,7 @@ void NeonTimer::Start() { // Keep the real schedule and add NeonInterceptorScheduler as an interceptor m_RealScheduler = &arm_compute::Scheduler::get(); - arm_compute::Scheduler::set(std::static_pointer_cast<arm_compute::IScheduler>(g_Interceptor)); + arm_compute::Scheduler::set(armnn::PolymorphicPointerDowncast<arm_compute::IScheduler>(g_Interceptor)); } } diff --git a/src/backends/reference/test/RefWorkloadFactoryHelper.hpp b/src/backends/reference/test/RefWorkloadFactoryHelper.hpp index e413d045f9..f0a842de57 100644 --- a/src/backends/reference/test/RefWorkloadFactoryHelper.hpp +++ b/src/backends/reference/test/RefWorkloadFactoryHelper.hpp @@ -7,6 +7,8 @@ #include <backendsCommon/test/WorkloadFactoryHelper.hpp> +#include <armnn/utility/PolymorphicDowncast.hpp> + #include <reference/RefBackend.hpp> #include <reference/RefWorkloadFactory.hpp> #include "reference/RefTensorHandleFactory.hpp" @@ -34,7 +36,7 @@ struct WorkloadFactoryHelper<armnn::RefWorkloadFactory> const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager = nullptr) { - return armnn::RefTensorHandleFactory(std::static_pointer_cast<armnn::RefMemoryManager>(memoryManager)); + return armnn::RefTensorHandleFactory(armnn::PolymorphicPointerDowncast<armnn::RefMemoryManager>(memoryManager)); } }; |