diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-14 15:44:18 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-14 14:42:59 +0000 |
commit | 04a729708f986b1a69c1efc42d5cf18271cfae1e (patch) | |
tree | d39be642c3b5bfe9f9520ae69889b20dade10406 /src/armnn | |
parent | 80c6b146046252af153af27025a28fb59d33c5e6 (diff) | |
download | armnn-04a729708f986b1a69c1efc42d5cf18271cfae1e.tar.gz |
IVGCVSW-5157 'Pipe ModelOption through Network::LoadNetwork() to Workload factory'
* Pass ModelOptions to WorkloadFactory
* Updated signature of CL and NEON Convolution2d workloads added FastMathEnabled param.
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I536178be8e4dd4083489e69febadaf0feeba46d2
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 11 | ||||
-rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 11 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 4a293b92d9..7b64a88470 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -146,14 +146,16 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net, if (backend->SupportsTensorAllocatorAPI()) { - auto workloadFactory = backend->CreateWorkloadFactory(m_TensorHandleFactoryRegistry); + auto workloadFactory = backend->CreateWorkloadFactory( + m_TensorHandleFactoryRegistry, m_OptimizedNetwork->GetModelOptions()); m_WorkloadFactories.emplace( std::make_pair(backendId, std::make_pair(std::move(workloadFactory), nullptr))); } else { IBackendInternal::IMemoryManagerSharedPtr memoryManager = backend->CreateMemoryManager(); - auto workloadFactory = backend->CreateWorkloadFactory(memoryManager); + auto workloadFactory = backend->CreateWorkloadFactory( + memoryManager, m_OptimizedNetwork->GetModelOptions()); m_WorkloadFactories.emplace( std::make_pair(backendId, std::make_pair(std::move(workloadFactory), memoryManager))); @@ -361,7 +363,10 @@ const IWorkloadFactory& LoadedNetwork::GetWorkloadFactory(const Layer& layer) co ARMNN_ASSERT_MSG(workloadFactory, "No workload factory"); std::string reasonIfUnsupported; - ARMNN_ASSERT_MSG(IWorkloadFactory::IsLayerSupported(layer, {}, reasonIfUnsupported), + ARMNN_ASSERT_MSG(IWorkloadFactory::IsLayerSupported(layer, + {}, + reasonIfUnsupported, + m_OptimizedNetwork->GetModelOptions()), "Factory does not support layer"); IgnoreUnused(reasonIfUnsupported); return *workloadFactory; diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index fe73550bbc..b13b9b538e 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -32,14 +32,16 @@ using namespace std; // Calls CreateWorkload for a layer, and checks the returned pointer is of the correct type. template<typename Workload> -std::unique_ptr<Workload> MakeAndCheckWorkload(Layer& layer, const IWorkloadFactory& factory) +std::unique_ptr<Workload> MakeAndCheckWorkload(Layer& layer, + const IWorkloadFactory& factory, + const ModelOptions& modelOptions = {}) { std::unique_ptr<IWorkload> workload = layer.CreateWorkload(factory); BOOST_TEST(workload.get() == PolymorphicDowncast<Workload*>(workload.get()), "Cannot convert to derived class"); std::string reasonIfUnsupported; layer.SetBackendId(factory.GetBackendId()); - BOOST_TEST(factory.IsLayerSupported(layer, layer.GetDataType(), reasonIfUnsupported)); + BOOST_TEST(factory.IsLayerSupported(layer, layer.GetDataType(), reasonIfUnsupported, modelOptions)); return std::unique_ptr<Workload>(static_cast<Workload*>(workload.release())); } @@ -220,7 +222,8 @@ std::unique_ptr<BatchNormalizationWorkloadType> CreateBatchNormalizationWorkload template <typename Convolution2dWorkload, armnn::DataType DataType> std::unique_ptr<Convolution2dWorkload> CreateConvolution2dWorkloadTest(armnn::IWorkloadFactory& factory, armnn::Graph& graph, - DataLayout dataLayout = DataLayout::NCHW) + DataLayout dataLayout = DataLayout::NCHW, + const ModelOptions& modelOptions = {}) { // Creates the layer we're testing. Convolution2dDescriptor layerDesc; @@ -255,7 +258,7 @@ std::unique_ptr<Convolution2dWorkload> CreateConvolution2dWorkloadTest(armnn::IW CreateTensorHandles(graph, factory); // Makes the workload and checks it. - auto workload = MakeAndCheckWorkload<Convolution2dWorkload>(*layer, factory); + auto workload = MakeAndCheckWorkload<Convolution2dWorkload>(*layer, factory, modelOptions); Convolution2dQueueDescriptor queueDescriptor = workload->GetData(); BOOST_TEST(queueDescriptor.m_Parameters.m_StrideX == 2); |