aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/Network.cpp
diff options
context:
space:
mode:
authorMatteo Martincigh <matteo.martincigh@arm.com>2019-01-15 16:11:44 +0000
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-01-23 12:06:53 +0000
commit3d6898cc5c83b133a3a2d6c79e2ed8905d236a4d (patch)
tree48f1899d3d952ca7ea5a2ae92a07468ef33bdd57 /src/armnn/Network.cpp
parent8c76cc1a6b899462882265d114d9a2b5a88d474a (diff)
downloadarmnn-3d6898cc5c83b133a3a2d6c79e2ed8905d236a4d.tar.gz
IVGCVSW-2455 Move the extra backend code to a new git repo
* Refactored all the workload factories to use "virtual" properly * Removed the precompiled layer support from the optimizer * Disabled compiler optimization for debug build to ease debugging Change-Id: I6ab83abd78f422771359295e25b79bb9be613cfd
Diffstat (limited to 'src/armnn/Network.cpp')
-rw-r--r--src/armnn/Network.cpp25
1 files changed, 1 insertions, 24 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 8a1437a0fb..f9ebad2b08 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -430,28 +430,6 @@ IOptimizedNetworkPtr Optimize(const INetwork& inNetwork,
Optimizer::Pass(optNetObjPtr->GetGraph(), MakeOptimizations(OptimizeInverseConversionsFp16(),
OptimizeInverseConversionsFp32()));
- // Insert pre-compiled layers where required by the backend
- // TODO: This is a dummy/default backend id used for making the code build until
- // we've properly refactored the optimizer
- const BackendId backendId(Compute::Undefined);
- auto const& backendRegistry = BackendRegistryInstance();
- if (backendRegistry.IsBackendRegistered(backendId))
- {
- // Obtain a backend object using the registered factory
- auto backendFactory = backendRegistry.GetFactory(backendId);
- auto backendObjPtr = backendFactory();
-
- OptimizationResult insertPreCompiledLayersResult = InsertPreCompiledLayers(optNetObjPtr,
- backendObjPtr,
- backendSettings,
- errMessages);
- if (insertPreCompiledLayersResult.m_Error)
- {
- // Failed to insert pre-compiled layers
- return IOptimizedNetworkPtr(nullptr, &IOptimizedNetwork::Destroy);
- }
- }
-
// If the debug flag is set, then insert a DebugLayer after each layer.
// NOTE: This optimization can only happen strictly after the PreCompiled layers have
// already been inserted
@@ -588,8 +566,7 @@ IConnectableLayer* Network::AddDepthwiseConvolution2dLayerImpl(
throw InvalidArgumentException("AddDepthwiseConvolution2dLayer: biases cannot be NULL");
}
- const auto layer = m_Graph->AddLayer<DepthwiseConvolution2dLayer>(convolution2dDescriptor,
- name);
+ const auto layer = m_Graph->AddLayer<DepthwiseConvolution2dLayer>(convolution2dDescriptor, name);
layer->m_Weight = std::make_unique<ScopedCpuTensorHandle>(weights);