COMPMID-630 : Rework nodes for selective target compilation.
Reworked nodes:
-ActivationLayer
Change-Id: Iaa394531ef208db48caa2c18a41ad9a845471f94
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/92281
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
diff --git a/src/graph/nodes/ConvolutionLayer.cpp b/src/graph/nodes/ConvolutionLayer.cpp
index 07d4261..d3ab97f 100644
--- a/src/graph/nodes/ConvolutionLayer.cpp
+++ b/src/graph/nodes/ConvolutionLayer.cpp
@@ -216,12 +216,10 @@
if(_num_groups == 1)
{
func = instantiate_convolution(in, out, conv_method_hint);
- ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating CLConvolutionLayer");
}
else
{
func = instantiate_grouped_convolution(in, out, conv_method_hint);
- ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating NEConvolutionLayer");
}
// Fill weights
@@ -253,10 +251,12 @@
std::unique_ptr<arm_compute::IFunction> func;
if(_target_hint == TargetHint::OPENCL)
{
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating CLConvolutionLayer");
func = instantiate<TargetHint::OPENCL>(input, _weights.tensor(), _biases.tensor(), output, _conv_info, _weights_info, conv_method_hint);
}
else
{
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating NEConvolutionLayer");
func = instantiate<TargetHint::NEON>(input, _weights.tensor(), _biases.tensor(), output, _conv_info, _weights_info, conv_method_hint);
}
return func;
@@ -318,10 +318,12 @@
// Instantiate convolution function
if(_target_hint == TargetHint::OPENCL)
{
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating CLConvolutionLayer");
func = instantiate<TargetHint::OPENCL>(_is[i].tensor(), _ws[i].tensor(), _bs[i].tensor(), _os[i].tensor(), _conv_info, _weights_info, conv_method_hint);
}
else
{
+ ARM_COMPUTE_LOG_GRAPH_INFO("Instantiating NEConvolutionLayer");
func = instantiate<TargetHint::NEON>(_is[i].tensor(), _ws[i].tensor(), _bs[i].tensor(), _os[i].tensor(), _conv_info, _weights_info, conv_method_hint);
}