This repository has been archived by the owner on Nov 17, 2023. It is now read-only.
[v1.7.x] ElementWiseSum fix for oneDNN #18777
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
|
Hey @bgawrych , Thanks for submitting the PR
CI supported jobs: [clang, unix-cpu, windows-cpu, sanity, edge, miscellaneous, windows-gpu, website, centos-cpu, unix-gpu, centos-gpu] Note: |
anko-intel
reviewed
Jul 23, 2020
src/operator/tensor/elemwise_sum.cc
Outdated
| for (const NDArray& in : inputs) { | ||
| // if ndarray is in default storage and MKLDNN is available, | ||
| // need to make sure cpu layout data is used, instead of MKL layout | ||
| if (in.storage_type() == kDefaultStorage) { |
anko-intel
reviewed
Jul 23, 2020
src/operator/tensor/elemwise_sum.cc
Outdated
| // if ndarray is in default storage and MKLDNN is available, | ||
| // need to make sure cpu layout data is used, instead of MKL layout | ||
| if (in.storage_type() == kDefaultStorage) { | ||
| in_data.push_back(in.Reorder2Default()); |
There was a problem hiding this comment.
what about emplace_back
|
Thanks for the fix. Looks that master branch also needs this fix. |
|
Thanks for the fix , problem is solved. |
|
@mxnet-bot run ci [unix-cpu] |
|
Jenkins CI successfully triggered : [unix-cpu] |
|
@wuxun-zhang @xinyu-intel Can you look again? I've changed fix by reordering conditions in (I think) proper way |
|
@bgawrych thx, can you please add a simple python test case for this fix? I think it should be more clear. |
pengzhao-intel
approved these changes
Jul 30, 2020
xinyu-intel
approved these changes
Jul 30, 2020
@pengzhao-intel Done :) |
3 tasks
|
@pengzhao-intel @bgawrych Missing in v1.x Was it intentional? |
|
Yes, it's better to include this PR. @anko-intel |
bgawrych
added a commit
to bgawrych/incubator-mxnet
that referenced
this pull request
Sep 21, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
bgawrych
added a commit
to bgawrych/incubator-mxnet
that referenced
this pull request
Sep 21, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
bgawrych
added a commit
to bgawrych/incubator-mxnet
that referenced
this pull request
Sep 21, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
4 tasks
bgawrych
added a commit
to bgawrych/incubator-mxnet
that referenced
this pull request
Sep 21, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
4 tasks
samskalicky
pushed a commit
that referenced
this pull request
Sep 22, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com> Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
pengzhao-intel
pushed a commit
that referenced
this pull request
Sep 23, 2020
* Fix ElementwiseSum for DNNL * Fix sanity and replace push_back with emplace_back * Change order of the data format conditions * Add NOLINT to avoid readability error * Add test for oneDNN ElemwiseSum Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com> Co-authored-by: Bart Gawrych <gawrych.bartlomiej@intel.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
This PR fixes bug which occurs when training gluonCV deeplab with oneDNN support.
Original issue: dmlc/gluon-cv#1368
To reproduce:
where train.py comes from https://gluon-cv.mxnet.io/_downloads/1f67ebbf3e0adc5c6fa863a3bc7672a6/train.py (from https://gluon-cv.mxnet.io/build/examples_segmentation/train_fcn.html )
Checklist
Essentials
Comments
Author of the fix is @anko-intel with my small help