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] Supporting native format in Convolution Bwd #42072

Merged
merged 4 commits into from
Aug 20, 2020
Merged

[Intel MKL] Supporting native format in Convolution Bwd #42072

merged 4 commits into from
Aug 20, 2020

Conversation

mahmoud-abuzaina
Copy link
Contributor

@mahmoud-abuzaina mahmoud-abuzaina commented Aug 5, 2020 •
edited

This PR adds support for native(user) format in convolution backward ops. _MklNative* ops will be used in both graph and eager modes.
This PR needs to be merged after "DNNL 1.5.1 Upgrade" PR is merged #42073

@google-ml-butler google-ml-butler bot added the size:M CL Change Size: Medium label Aug 5, 2020
@gbaned gbaned self-assigned this Aug 6, 2020
@gbaned gbaned added the comp:mkl MKL related issues label Aug 6, 2020
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Aug 6, 2020
@gbaned gbaned requested a review from penpornk August 6, 2020 04:37
@gbaned gbaned added the awaiting review Pull request awaiting review label Aug 11, 2020
penpornk
penpornk requested changes Aug 18, 2020
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 and I'm sorry for the delay! I have a few comments.

tensorflow/core/kernels/mkl/mkl_conv_grad_filter_ops.cc Outdated
@@ -92,7 +95,7 @@ struct MklConvBwdFilterParams {
#endif // !ENABLE_MKLDNN_V1
};

template <typename T>
template <typename T, bool native_format>
Copy link
Member

Choose a reason for hiding this comment

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

I don't think native_format needs to be a template parameter here. Can we make this a normal parameter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

tensorflow/core/kernels/mkl/mkl_conv_grad_input_ops.cc Outdated
@@ -94,7 +97,7 @@ struct MklConvBwdInputParams {
#endif // !ENABLE_MKLDNN_V1
};

template <typename T>
template <typename T, bool native_format>
Copy link
Member

Choose a reason for hiding this comment

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

Same here. Can we make native_format a regular parameter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

tensorflow/core/kernels/mkl/mkl_conv_grad_filter_ops.cc Outdated
@@ -361,25 +370,28 @@ class MklConvBwdFilterPrimitive : public MklPrimitive {
struct ConvBwdFilterContext context_;
};

template <typename T>
template <typename T, bool native_format>
Copy link
Member

Choose a reason for hiding this comment

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

Same here. Can we make native_format a regular parameter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

tensorflow/core/kernels/mkl/mkl_conv_grad_input_ops.cc Outdated
@@ -298,28 +308,31 @@ class MklConvBwdInputPrimitive : public MklPrimitive {
struct ConvBwdInputContext context_;
};

template <typename T>
template <typename T, bool native_format>
Copy link
Member

Choose a reason for hiding this comment

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

Same here. Can we make native_format a regular parameter?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

PR Queue automation moved this from Assigned Reviewer to Reviewer Requested Changes Aug 18, 2020
@penpornk penpornk mentioned this pull request Aug 18, 2020
Merged
@penpornk penpornk removed the awaiting review Pull request awaiting review label Aug 18, 2020
@mahmoud-abuzaina
Copy link
Contributor Author

Thank you for the review. I have made the changes based on your comments.

penpornk
penpornk approved these changes Aug 19, 2020
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 quick changes!

PR Queue automation moved this from Reviewer Requested Changes to Approved by Reviewer Aug 19, 2020
@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Aug 19, 2020
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Aug 19, 2020
@penpornk
Copy link
Member

@mahmoud-abuzaina Could you please help resolve the merge conflict? Thank you!

@google-ml-butler google-ml-butler bot removed the ready to pull PR ready for merge process label Aug 20, 2020
@mahmoud-abuzaina
Copy link
Contributor Author

Actually I did not find any conflict but did merge with master. Can you check now?

penpornk
penpornk approved these changes Aug 20, 2020
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! I'll try pulling it in again. If this doesn't work, I'll take care of it internally.

@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Aug 20, 2020
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Aug 20, 2020
@tensorflow-copybara tensorflow-copybara merged commit 75341df into tensorflow:master Aug 20, 2020
PR Queue automation moved this from Approved by Reviewer to Merged Aug 20, 2020
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
6 participants
@mahmoud-abuzaina @penpornk @googlebot @kokoro-team @tensorflow-copybara @gbaned