diff options
author | David Beck <david.beck@arm.com> | 2018-10-18 15:13:56 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
commit | 33f0ae0d293f5048089f2a04985a8a8bfa1d75a6 (patch) | |
tree | 19f27463e524150c26ac75a2ea5c8e6c95f954c6 /src/armnn/LoadedNetwork.cpp | |
parent | ceae3aa1b619161d49fd2847d3c73d6a858b2b8c (diff) | |
download | armnn-33f0ae0d293f5048089f2a04985a8a8bfa1d75a6.tar.gz |
IVGCVSW-2019 : replace Compute enum in the Layer object
Change-Id: I76551d511ef718eac36e5b8e5fe426ec3a402855
Diffstat (limited to 'src/armnn/LoadedNetwork.cpp')
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index ce9f76c986..4f73bda832 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -122,7 +122,7 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<OptimizedNetwork> net) const char* const layerName = layer->GetNameStr().length() != 0 ? layer->GetName() : "<Unnamed>"; throw InvalidArgumentException(boost::str( boost::format("No workload created for layer (name: '%1%' type: '%2%') (compute '%3%')") - % layerName % static_cast<int>(layer->GetType()) % layer->GetComputeDevice() + % layerName % static_cast<int>(layer->GetType()) % layer->GetBackendId().Get() )); } @@ -176,27 +176,17 @@ const IWorkloadFactory& LoadedNetwork::GetWorkloadFactory(const Layer& layer) co { const IWorkloadFactory* workloadFactory = nullptr; - switch (layer.GetComputeDevice()) + if (layer.GetBackendId() == Compute::CpuAcc) { - case Compute::CpuAcc: - { - workloadFactory = &m_CpuAcc; - break; - } - case Compute::GpuAcc: - { - workloadFactory = &m_GpuAcc; - break; - } - case Compute::CpuRef: - { - workloadFactory = &m_CpuRef; - break; - } - default: - { - break; - } + workloadFactory = &m_CpuAcc; + } + else if (layer.GetBackendId() == Compute::GpuAcc) + { + workloadFactory = &m_GpuAcc; + } + else if (layer.GetBackendId() == Compute::CpuRef) + { + workloadFactory = &m_CpuRef; } BOOST_ASSERT_MSG(workloadFactory, "No workload factory"); |