Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Intel MKL] Make Vanilla TF and MKL-based TF use common oneDNN build #47679

Merged
merged 4 commits into from Mar 19, 2021
Merged

[Intel MKL] Make Vanilla TF and MKL-based TF use common oneDNN build #47679

merged 4 commits into from Mar 19, 2021

Conversation

mahmoud-abuzaina
Copy link
Contributor

No description provided.

@google-ml-butler google-ml-butler bot added the size:M CL Change Size: Medium label Mar 9, 2021
@google-cla google-cla bot added the cla: yes label Mar 9, 2021
@mahmoud-abuzaina
Copy link
Contributor Author

@penpornk Here is the PR to unify the oneDNN build. Thank you!

@penpornk penpornk self-requested a review March 9, 2021 22:53
@penpornk
Copy link
Member

penpornk commented Mar 9, 2021

@mahmoud-abuzaina Thank you for the PR!
#47543 might be reverted soon because of a nightly docker test build failure. I won't review this PR yet until we are sure the oneDNN v2.1 upgrade will stay.

@mahmoud-abuzaina
Copy link
Contributor Author

@penpornk Thank you for the update. If you can share the oneDNN-related failure details, that would help us to look at it and fix it.

@gbaned gbaned self-assigned this Mar 10, 2021
@gbaned gbaned added the comp:mkl MKL related issues label Mar 10, 2021
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Mar 10, 2021
@gbaned
Copy link
Contributor

gbaned commented Mar 10, 2021

@mahmoud-abuzaina Can you please resolve conflicts? Thanks!

@mahmoud-abuzaina
Copy link
Contributor Author

@gbaned this PR depends on #47743. I will need to resolve the conflicts anyway once that is merged.

@gzmkl gzmkl mentioned this pull request Mar 12, 2021
Closed
penpornk
penpornk approved these changes Mar 15, 2021
View reviewed changes
Copy link
Member

@penpornk penpornk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the PR!

@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Mar 15, 2021
PR Queue automation moved this from Assigned Reviewer to Approved by Reviewer Mar 15, 2021
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Mar 15, 2021
@alenik01 alenik01 mentioned this pull request Mar 15, 2021
Merged
penpornk
penpornk requested changes Mar 15, 2021
View reviewed changes
Copy link
Member

@penpornk penpornk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test failures are similar to those of PR #47743 (which needed headers in include/**/* for dnnl_single_threaded).

third_party/mkl_dnn/mkldnn_v1.BUILD Outdated
Comment on lines 158 to 165
textual_hdrs = glob([
"include/**/*",
"src/common/*.hpp",
"src/cpu/*.hpp",
"src/cpu/**/*.hpp",
"src/cpu/x64/jit_utils/jitprofiling/*.h",
"src/cpu/x64/xbyak/*.h",
]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add this textual_hdrs list to the mkl_dnn target? Please also remove header files (*.h, *.hpp) from mkl_dnn's src list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Done.

PR Queue automation moved this from Approved by Reviewer to Reviewer Requested Changes Mar 15, 2021
@google-ml-butler google-ml-butler bot removed the ready to pull PR ready for merge process label Mar 15, 2021
@mahmoud-abuzaina
Copy link
Contributor Author

Thank you for pointing out the solution for the build error. I have made the changes.

PR Queue automation moved this from Reviewer Requested Changes to Approved by Reviewer Mar 18, 2021
penpornk
penpornk approved these changes Mar 18, 2021
View reviewed changes
Copy link
Member

@penpornk penpornk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the changes!

@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Mar 18, 2021
@gbaned gbaned added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process and removed kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Mar 18, 2021
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Mar 18, 2021
@copybara-service copybara-service bot merged commit 2b4c8a5 into tensorflow:master Mar 19, 2021
PR Queue automation moved this from Approved by Reviewer to Merged Mar 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@penpornk penpornk penpornk approved these changes

Assignees

@gbaned gbaned

Labels
cla: yes comp:mkl MKL related issues ready to pull PR ready for merge process size:M CL Change Size: Medium
Projects
PR Queue
  
Merged
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mahmoud-abuzaina @penpornk @gbaned @kokoro-team