IVGCVSW-6632 OptimizationViews: has INetwork rather than Graph for holding layers
* Deprecate the GetGraph() function in OptimizationViews & remove/fix
occurances where OptimizationViews.GetGraph() is called.
* OptimizationViews has member INetworkPtr.
* OptimizationViews has GetINetwork() method.
* Unit test added to OptimizationViewsTests.cpp.
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ifc1e53f1c34d786502279631942f0472f401038e
diff --git a/src/backends/cl/ClBackend.cpp b/src/backends/cl/ClBackend.cpp
index 5c58269..339c1aa 100644
--- a/src/backends/cl/ClBackend.cpp
+++ b/src/backends/cl/ClBackend.cpp
@@ -304,11 +304,11 @@
if (status)
{
- FuseLayerWithWeightsAndBiases<Convolution2dLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseConvolution2dLayer<Convolution2dLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -335,11 +335,11 @@
if (status)
{
- FuseLayerWithWeightsAndBiases<DepthwiseConvolution2dLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseDepthwiseConvolution2dLayer<DepthwiseConvolution2dLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -358,11 +358,11 @@
if (status)
{
- FuseLayerWithWeightsAndBiases<FullyConnectedLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseFullyConnectedLayer<FullyConnectedLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -385,7 +385,7 @@
if (status)
{
BatchNormalizationLayer* replacementLayer =
- FuseLayerWithParameters<BatchNormalizationLayer>(optimizationViews,
+ FuseBatchNormalizationLayer<BatchNormalizationLayer>(optimizationViews,
baseLayer,
activationLayer,
activationDesc,
@@ -411,11 +411,11 @@
if (status)
{
- FuseLayerWithoutParameters<AdditionLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseAdditionLayer<AdditionLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -432,11 +432,11 @@
if (status)
{
- FuseLayerWithoutParameters<DivisionLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseDivisionLayer<DivisionLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -453,11 +453,11 @@
if (status)
{
- FuseLayerWithoutParameters<MultiplicationLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseMultiplicationLayer<MultiplicationLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}
@@ -474,11 +474,11 @@
if (status)
{
- FuseLayerWithoutParameters<SubtractionLayer>(optimizationViews,
- baseLayer,
- activationLayer,
- activationDesc,
- name);
+ FuseSubtractionLayer<SubtractionLayer>(optimizationViews,
+ baseLayer,
+ activationLayer,
+ activationDesc,
+ name);
untouched.erase(baseLayer->GetGuid());
untouched.erase(activationLayer->GetGuid());
}