-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Arm(R) Ethos(TM)-U NPU Depthwise2d operator support #9209
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ac1eed6
Arm(R) Ethos(TM)-U NPU Depthwise2d operator support
ekalda 1909515
Change depthwise2d to depthwise_conv2d
ekalda 7c510fc
Make a line shorter and add a comment
ekalda 1d586dd
Change the order of imports
ekalda f43e088
Whitespace change
ekalda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
205 changes: 205 additions & 0 deletions
205
python/tvm/relay/backend/contrib/ethosu/op/depthwise.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| # pylint: disable=unused-argument | ||
| """Relay operator for depthwise convolution""" | ||
| from typing import Tuple | ||
|
|
||
| import tvm | ||
| from tvm.relay.op import _make | ||
| from tvm.topi.generic import schedule_injective | ||
| from tvm.relay.op.op import OpStrategy | ||
| from tvm.relay.op import strategy as _strategy | ||
|
|
||
| from ..te import depthwise_conv2d_compute | ||
|
|
||
|
|
||
| def _extract_ethosu_depthwise_conv2d_params(attrs, args): | ||
| """Get the parameters necessary to construct a ethosu_depthwise_conv2d compute TE | ||
| from a ethosu_depthwise_conv2d Relay call.""" | ||
| ifm = args[0] | ||
| weight = args[1] | ||
| scale_bias = args[2] | ||
| lut = args[3] | ||
| ifm_scale = attrs.ifm_scale | ||
| ifm_zero_point = attrs.ifm_zero_point | ||
| weight_zero_point = attrs.weight_zero_point | ||
| ofm_scale = attrs.ofm_scale | ||
| ofm_zero_point = attrs.ofm_zero_point | ||
| strides = attrs.strides | ||
| padding = attrs.padding | ||
| dilation = attrs.dilation | ||
| activation = attrs.activation | ||
| clip_min = attrs.clip_min | ||
| clip_max = attrs.clip_max | ||
| upscale = attrs.upscale | ||
| ifm_layout = attrs.ifm_layout | ||
| ofm_layout = attrs.ofm_layout | ||
|
|
||
| return ( | ||
| ifm, | ||
| weight, | ||
| scale_bias, | ||
| lut, | ||
| ifm_scale, | ||
| ifm_zero_point, | ||
| weight_zero_point, | ||
| ofm_scale, | ||
| ofm_zero_point, | ||
| strides, | ||
| padding, | ||
| dilation, | ||
| activation, | ||
| clip_min, | ||
| clip_max, | ||
| upscale, | ||
| ifm_layout, | ||
| ofm_layout, | ||
| ) | ||
|
|
||
|
|
||
| @tvm.ir.register_op_attr("contrib.ethosu.depthwise_conv2d", "FTVMCompute") | ||
| def create_ethosu_depthwise_conv2d_compute(attrs, args, out_type): | ||
| """Create an ethosu_depthwise_conv2d compute op.""" | ||
| params = _extract_ethosu_depthwise_conv2d_params(attrs, args) | ||
| op = depthwise_conv2d_compute(*params) | ||
| return [op] | ||
|
|
||
|
|
||
| @tvm.ir.register_op_attr("contrib.ethosu.depthwise_conv2d", "FTVMStrategy") | ||
| def depthwise_conv2d_strategy_ethosu(attrs, inputs, out_type, target): | ||
| strategy = OpStrategy() | ||
| strategy.add_implementation( | ||
| create_ethosu_depthwise_conv2d_compute, | ||
| _strategy.wrap_topi_schedule(schedule_injective), | ||
| name="ethosu_depthwise_conv2d", | ||
| ) | ||
| return strategy | ||
|
|
||
|
|
||
| def ethosu_depthwise_conv2d( | ||
| ifm: tvm.relay.Expr, | ||
| weight: tvm.relay.Expr, | ||
| scale_bias: tvm.relay.Expr, | ||
| lut: tvm.relay.Expr, | ||
| ifm_scale: float, | ||
| ifm_zero_point: int, | ||
| weight_zero_point: int, | ||
| ofm_scale: float, | ||
| ofm_zero_point: int, | ||
| kernel_shape: Tuple[int, int], | ||
| ofm_channels: int, | ||
| strides: Tuple[int, int] = (1, 1), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit : We can use Optional[Tuple[int, int]]
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I left it as is since Optional is used when the variable can take a value None |
||
| padding: Tuple[int, int, int, int] = (0, 0, 0, 0), | ||
| dilation: Tuple[int, int] = (1, 1), | ||
| activation: str = "NONE", | ||
| clip_min: int = 0, | ||
| clip_max: int = 0, | ||
| upscale: str = "NONE", | ||
| ifm_layout: str = "NHWC", | ||
| ofm_layout: str = "NHWC", | ||
| ) -> tvm.relay.Call: | ||
| """This is a quantized 2D depthwise convolution operation as supported | ||
| by the NPU. It accepts either NHWC or NHCWB16 format | ||
| for the input data and OHWI format for the kernel weights. | ||
|
|
||
| Reference: https://developer.arm.com/documentation/102420/0200/ | ||
|
|
||
| Note that the per-channel weight scale and bias tensor must be | ||
| packed together into a combined tensor of uint80s. This is represented | ||
| in TVM by a (channels, 10) tensor of type uint8. For more detail, | ||
| refer to the Technical Reference Manual linked above. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| ifm : tvm.relay.Expr | ||
| The Input Feature Map tensor (IFM). | ||
| weight : tvm.relay.Expr | ||
| The weight tensor. | ||
| scale_bias : tvm.relay.Expr | ||
| The packed per-channel weight scale and bias tensor. | ||
| lut : tvm.relay.Expr | ||
| The look-up table values to use if activation = "LUT" | ||
| ifm_scale : float | ||
| The quantization scale for the Input Feature Map tensor. | ||
| ifm_zero_point : int | ||
| The quantization zero point for the Input Feature Map tensor. | ||
| weight_zero_point : int | ||
| The quantization zero point for the weight tensor. | ||
| ofm_scale : float | ||
| The quantization scale for the Output Feature Map tensor. | ||
| ofm_zero_point : int | ||
| The quantization zero point for the Output Feature Map tensor. | ||
| kernel_shape : tuple of int | ||
| The 2 dimensional kernel shape as (kernel_height, kernel_width). | ||
| ofm_channels : int | ||
| The number of OFM channels. | ||
| strides : tuple of int, optional | ||
| The 2 dimensional strides as (stride_height, stride_width). | ||
| padding : tuple of int, optional | ||
| The 4 dimensional padding as (pad_top, pad_left, pad_bottom, pad_right). | ||
| dilation : tuple of int, optional | ||
| The 2 dimensional dilation as (dilation_height, dilation_width). | ||
| activation : str, optional | ||
| The activation function to use. | ||
| "NONE" - no activation function. | ||
| "CLIP" - clip the output between clip_min and clip_max. | ||
| "TANH" - tanh activation function. | ||
| "SIGMOID" - sigmoid activation function. | ||
| "LUT" - use a look-up table to perform | ||
| the activation function. | ||
| clip_min : int, optional | ||
| The minimum clipping value if activation = "CLIP" | ||
| clip_max : int, optional, | ||
| The maximum clipping value if activation = "CLIP" | ||
| upscale : str, optional | ||
| The 2x2 upscaling mode to apply to the Input Feature Map tensor. | ||
| "NONE" - no upscaling. | ||
| "NEAREST" - upscale using nearest neighbour. | ||
| "ZEROS" - upscale using zeros. | ||
| ifm_layout : str, optional | ||
| The layout of the Input Feature Map tensor. Can be "NHWC" or "NHCWB16". | ||
| ofm_layout : str, optional | ||
| The layout of the Output Feature Map tensor. Can be "NHWC" or "NHCWB16". | ||
|
|
||
| Returns | ||
| ------- | ||
| out : tvm.relay.Call | ||
| A call to the ethosu_depthwise_conv2d op. | ||
|
|
||
| """ | ||
| return _make.ethosu_depthwise_conv2d( | ||
| ifm, | ||
| weight, | ||
| scale_bias, | ||
| lut, | ||
| ifm_scale, | ||
| ifm_zero_point, | ||
| weight_zero_point, | ||
| ofm_scale, | ||
| ofm_zero_point, | ||
| kernel_shape, | ||
| ofm_channels, | ||
| strides, | ||
| padding, | ||
| dilation, | ||
| activation, | ||
| clip_min, | ||
| clip_max, | ||
| upscale, | ||
| ifm_layout, | ||
| ofm_layout, | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,3 +17,4 @@ | |
| """Tensor Expressions for the NPU""" | ||
|
|
||
| from .convolution import * | ||
| from .depthwise import * | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it worth supporting OHWI weights here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC, in the Relay that corresponds to depthwise conv2d operator from TFLite, the weights are always in HWOI, that's why other formats are not handled here.