From 05069f07bcf95676597698a79926327555276362 Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Thu, 26 Sep 2019 17:18:26 +0100 Subject: COMPMID-2515: Merge optimized depthwise convolution to the generic depthwise convolution function 3RDPARTY_UPDATE Change-Id: Iff9e915c5329c617527b6f5042979f4e21a8b2b8 Signed-off-by: Manuel Bottini Reviewed-on: https://review.mlplatform.org/c/2022 Comments-Addressed: Arm Jenkins Reviewed-by: Giorgio Arena Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas --- arm_compute/graph/backends/FunctionHelpers.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'arm_compute/graph/backends/FunctionHelpers.h') diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 94b385e81e..ee257e3abf 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -538,7 +538,7 @@ std::unique_ptr create_deconvolution_layer(DeconvolutionLayerNode &no * * @return Backend depth-wise convolution layer function */ -template +template std::unique_ptr create_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) { validate_node(node, 3 /* expected inputs */, 1 /* expected outputs */); @@ -556,26 +556,17 @@ std::unique_ptr create_depthwise_convolution_layer(DepthwiseConvoluti biases->info()->set_data_type(DataType::S32); } - const PadStrideInfo conv_info = node.convolution_info(); - const DepthwiseConvolutionMethod dwc_algorithm = node.depthwise_convolution_method(); - const unsigned int depth_multiplier = node.depth_multiplier(); - const ActivationLayerInfo fused_act = node.fused_activation(); + const PadStrideInfo conv_info = node.convolution_info(); + const unsigned int depth_multiplier = node.depth_multiplier(); + const ActivationLayerInfo fused_act = node.fused_activation(); // Create and configure function (we assume that functions have been validated before creation) std::unique_ptr func; std::string func_name; - if(dwc_algorithm == DepthwiseConvolutionMethod::Optimized3x3) - { - std::tie(func, func_name) = create_named_function( - std::string("DepthwiseConvolutionLayer3x3"), - input, weights, biases, output, conv_info, depth_multiplier, fused_act); - } - else - { - std::tie(func, func_name) = create_named_function( - std::string("DepthwiseConvolutionLayer"), - input, weights, biases, output, conv_info, depth_multiplier, fused_act); - } + + std::tie(func, func_name) = create_named_function( + std::string("DepthwiseConvolutionLayer"), + input, weights, biases, output, conv_info, depth_multiplier, fused_act); // Log info std::ostringstream qss; -- cgit v1.2.1