Fix x86 depthwise conv2d alter_op_layout #3264
Merged
Conversation
This file contains 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
tqchen
added
status: need test case
yzhliu
reviewed
Jun 1, 2019
| @@ -415,7 +415,8 @@ def _alter_conv2d_layout(attrs, inputs, tinfo, F): | |||
|
|
|||
| dtype = data.dtype | |||
| out_dtype = dtype if out_dtype in ("same", "") else out_dtype | |||
| is_depthwise = groups == in_channel and groups == out_channel | |||
| kshape = get_const_tuple(kernel.shape) | |||
| is_depthwise = groups == kshape[0] and kshape[1] == 1 | |||
There was a problem hiding this comment.
do we need to check kernel layout?
kevinthesun
force-pushed
the
MoveX86DepthwiseConv
branch
from
0a6a274 to
39c622e
Compare
yzhliu
reviewed
Jun 5, 2019
topi/python/topi/x86/conv2d.py
Outdated
| @@ -415,11 +415,15 @@ def _alter_conv2d_layout(attrs, inputs, tinfo, F): | |||
|
|
|||
| dtype = data.dtype | |||
| out_dtype = dtype if out_dtype in ("same", "") else out_dtype | |||
| is_depthwise = groups == in_channel and groups == out_channel | |||
|
|
|||
| # only optimize for NCHW | |||
| if layout != 'NCHW': | |||
There was a problem hiding this comment.
Suggested change
| if layout != 'NCHW': | |
| if layout != 'NCHW' or attrs["kernel_layout"] != "OIHW": |
and remove the assert below.
yzhliu
approved these changes
Jun 6, 2019
|
Thanks @kevinthesun ! |
yzhliu
added
status: accepted
and removed
status: need review
status: need test case
wweic
pushed a commit
to wweic/tvm
that referenced
this pull request
Jun 26, 2019
* Fix x86 depthwise conv2d alter_op_layout * Small fix * Add test case * Fix test * Assert kernel layout * Minor fix * Add get_shape function * Minor change
wweic
pushed a commit
to neo-ai/tvm
that referenced
this pull request
Jun 27, 2019
* Fix x86 depthwise conv2d alter_op_layout * Small fix * Add test case * Fix test * Assert kernel layout * Minor fix * Add get_shape function * Minor change
|
@kevinthesun Looks like this PR makes autotvm to "skips depthwise_conv2d_nchw workloads for llvm x86_64" |
|
Issue: #3557 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix x86 depthwise conv2d alter_op_layout. Related discussion topic: https://discuss.tvm.ai/t/x86-relay-auto-tune-mobilefacenet-error-using-relay/2508/22