diff options
author | Manuel Bottini <manuel.bottini@arm.com> | 2019-09-26 17:18:26 +0100 |
---|---|---|
committer | Manuel Bottini <manuel.bottini@arm.com> | 2019-10-23 16:56:45 +0000 |
commit | 05069f07bcf95676597698a79926327555276362 (patch) | |
tree | a4a861127660aa439c9468da7479d92cecc85138 /arm_compute/graph/backends/ValidateHelpers.h | |
parent | e36b5266e4c6593932432bc0289e431d007b8710 (diff) | |
download | ComputeLibrary-05069f07bcf95676597698a79926327555276362.tar.gz |
COMPMID-2515: Merge optimized depthwise convolution to the generic depthwise convolution function
3RDPARTY_UPDATE
Change-Id: Iff9e915c5329c617527b6f5042979f4e21a8b2b8
Signed-off-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2022
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'arm_compute/graph/backends/ValidateHelpers.h')
-rw-r--r-- | arm_compute/graph/backends/ValidateHelpers.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 13de273bdf..9170006d9c 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -163,13 +163,12 @@ Status validate_convolution_layer(ConvolutionLayerNode &node) /** Validates a Depthwise Convolution layer node * * @tparam DepthwiseConvolutionLayer Default Depthwise Convolution layer type - * @tparam DepthwiseConvolutionLayer3x3 Optimized 3x3 Depthwise Convolution layer type * * @param[in] node Node to validate * * @return Status */ -template <typename DepthwiseConvolutionLayer, typename DepthwiseConvolutionLayer3x3> +template <typename DepthwiseConvolutionLayer> Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) { ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating DepthwiseConvolutionLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl); @@ -191,11 +190,8 @@ Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) switch(dwc_algorithm) { case DepthwiseConvolutionMethod::Default: - case DepthwiseConvolutionMethod::GEMV: - status = DepthwiseConvolutionLayer::validate(input, weights, biases, output, conv_info, depth_multiplier); - break; case DepthwiseConvolutionMethod::Optimized3x3: - status = DepthwiseConvolutionLayer3x3::validate(input, weights, biases, output, conv_info, depth_multiplier); + status = DepthwiseConvolutionLayer::validate(input, weights, biases, output, conv_info, depth_multiplier); break; default: ARM_COMPUTE_RETURN_ERROR_MSG("Unsupported depthwise convolution method"); |