enable concat linear with mkldnn linear by flag #139048
Closed
Conversation
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
🔗 Helpful Links🧪 See artifacts and rendered test results at hud.pytorch.org/pr/139048
Note: Links to docs will display an error until the docs builds have been completed. ✅ No FailuresAs of commit db8300d with merge base 034b105 ( This comment was automatically generated by Dr. CI and updates every 15 minutes. |
zhuhaozhe
added
topic: not user facing
jgong5
requested changes
Nov 12, 2024
Collaborator
jgong5
left a comment
jgong5
left a comment
There was a problem hiding this comment.
Could you please update the PR description on changes?
| KeywordArg("reshape_2"), | ||
| ), | ||
| pass_number=1, | ||
| pass_number=2, |
Collaborator
Author
There was a problem hiding this comment.
Previously mkldnn_linear pass is 0 and _recover_linear is based on mkldnn_linear so it should be 1.
Now we set mkldnn_linear pass to 1 (since concat linear is 0), then the recover_linear pass number should be 2.
Collaborator
There was a problem hiding this comment.
Please add the note in the code too.
Collaborator
Author
There was a problem hiding this comment.
Thanks for advice, added this note in code.
jgong5
approved these changes
Nov 12, 2024
Collaborator
Author
|
@pytorchbot merge |
Collaborator
Merge failedReason: Approvers from one of the following sets are needed:
|
Collaborator
Author
|
@pytorchbot rebase |
Collaborator
|
@pytorchbot started a rebase job onto refs/remotes/origin/viable/strict. Check the current status here |
Enable concat linear for CPU mkldnn path. Previously, we have a concat linear in freezing passes but it not worked on CPU. This is because `concat_linear` pattern happened after `mkldnn_weight_prepack`. And `concat_linear` only handle `addmm/mm` etc. ``` addmm -> mkldnn linear addmm -> mkldnn linear -> cannot concat # only worked when disable mkldnn addmm -> addmm -> concat linear ``` Now we changed `mkldnn linear` related pass numbers larger than `concat_linear` pass numbers. ``` addmm -> concat linear -> mkldnn linear addmm -> ``` So it can work fine with mkldnn linear now. Also, since concat linear not always have benefits. We add 1 flag `config.cpp.enable_concat_linear` and set default value to False. User can enable this by their need. cc voznesenskym penguinwu EikanWang jgong5 Guobing-Chen XiaobingSuper blzheng wenzhe-nrv jiayisunx ipiszy yf225 chenyang78 kadeng muchulee8 ColinPeppler amjames desertfire chauhang aakhundov [ghstack-poisoned]
Collaborator
|
Successfully rebased |
jansel
approved these changes
Nov 13, 2024
Collaborator
Author
|
@pytorchbot merge |
Collaborator
Merge startedYour change will be merged once all checks pass (ETA 0-4 Hours). Learn more about merging in the wiki. Questions? Feedback? Please reach out to the PyTorch DevX Team |
zero000064
pushed a commit
to zero000064/pytorch
that referenced
this pull request
Nov 14, 2024
Enable concat linear for CPU mkldnn path. Previously, we have a concat linear in freezing passes but it not worked on CPU. This is because `concat_linear` pattern happened after `mkldnn_weight_prepack`. And `concat_linear` only handle `addmm/mm` etc. ``` addmm -> mkldnn linear addmm -> mkldnn linear -> cannot concat # only worked when disable mkldnn addmm -> addmm -> concat linear ``` Now we changed `mkldnn linear` related pass numbers larger than `concat_linear` pass numbers. ``` addmm -> concat linear -> mkldnn linear addmm -> ``` So it can work fine with mkldnn linear now. Also, since concat linear not always have benefits. We add 1 flag `config.cpp.enable_concat_linear` and set default value to False. User can enable this by their need. Pull Request resolved: pytorch#139048 Approved by: https://github.com/jgong5, https://github.com/jansel
pobin6
pushed a commit
to pobin6/pytorch
that referenced
this pull request
Dec 5, 2024
Enable concat linear for CPU mkldnn path. Previously, we have a concat linear in freezing passes but it not worked on CPU. This is because `concat_linear` pattern happened after `mkldnn_weight_prepack`. And `concat_linear` only handle `addmm/mm` etc. ``` addmm -> mkldnn linear addmm -> mkldnn linear -> cannot concat # only worked when disable mkldnn addmm -> addmm -> concat linear ``` Now we changed `mkldnn linear` related pass numbers larger than `concat_linear` pass numbers. ``` addmm -> concat linear -> mkldnn linear addmm -> ``` So it can work fine with mkldnn linear now. Also, since concat linear not always have benefits. We add 1 flag `config.cpp.enable_concat_linear` and set default value to False. User can enable this by their need. Pull Request resolved: pytorch#139048 Approved by: https://github.com/jgong5, https://github.com/jansel
fmo-mt
pushed a commit
to fmo-mt/pytorch
that referenced
this pull request
Dec 11, 2024
Enable concat linear for CPU mkldnn path. Previously, we have a concat linear in freezing passes but it not worked on CPU. This is because `concat_linear` pattern happened after `mkldnn_weight_prepack`. And `concat_linear` only handle `addmm/mm` etc. ``` addmm -> mkldnn linear addmm -> mkldnn linear -> cannot concat # only worked when disable mkldnn addmm -> addmm -> concat linear ``` Now we changed `mkldnn linear` related pass numbers larger than `concat_linear` pass numbers. ``` addmm -> concat linear -> mkldnn linear addmm -> ``` So it can work fine with mkldnn linear now. Also, since concat linear not always have benefits. We add 1 flag `config.cpp.enable_concat_linear` and set default value to False. User can enable this by their need. Pull Request resolved: pytorch#139048 Approved by: https://github.com/jgong5, https://github.com/jansel
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.
Enable concat linear for CPU mkldnn path.
Previously, we have a concat linear in freezing passes but it not worked on CPU.
This is because
concat_linearpattern happened aftermkldnn_weight_prepack. Andconcat_linearonly handleaddmm/mmetc.Now we changed
mkldnn linearrelated pass numbers larger thanconcat_linearpass numbers.So it can work fine with mkldnn linear now.
Also, since concat linear not always have benefits. We add 1 flag
config.cpp.enable_concat_linearand set default value to False. User can enable this by their need.Stack from ghstack (oldest at bottom):
cc @voznesenskym @penguinwu @EikanWang @jgong5 @Guobing-Chen @XiaobingSuper @blzheng @wenzhe-nrv @jiayisunx @ipiszy @yf225 @chenyang78 @kadeng @muchulee8 @ColinPeppler @amjames @desertfire @chauhang @aakhundov