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.

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

[ROCm] Fix for breakage in XLA Conv Op functionality #46219

Merged

Conversation

deven-amd
Copy link
Contributor

The following commit breaks Conv Op functionality (in the XLA backend) for ROCm platform.

8684c6b

The cause seems to be that the scratch_size field in the new GpuConvDescriptor is not getting correctly populated in the new MLIR path. It is being used correctly in the convolution runner code.

declaration:

8684c6b#diff-6453912dbc4ee715a56da9d7b218b52795dea2aa631a482101fc6d58c573d9ccR122-R135

use (get access) in conv runner:

8684c6b#diff-a01181d08b28a9c7432f22439622f16725126184283a73822c70b2151098a8adR277

set access in non-MLIR(?) based path:

8684c6b#diff-a01181d08b28a9c7432f22439622f16725126184283a73822c70b2151098a8adR450

This commit merely adds the missing "set" in the MLIR based path


thanks to @ekuznetsov139 for identifying the fix

/cc @chsigg @cheshire @nvining-work

The following commit breaks Conv Op functionality (in the XLA backend) for ROCm platform.

tensorflow@8684c6b

The cause seems to be that the `scratch_size` field in the new `GpuConvDescriptor` is not getting correctly populated in the new MLIR path. It is being used correctly in the convolution runner code.

declaration:

tensorflow@8684c6b#diff-6453912dbc4ee715a56da9d7b218b52795dea2aa631a482101fc6d58c573d9ccR122-R135

use (get access) in conv runner:

tensorflow@8684c6b#diff-a01181d08b28a9c7432f22439622f16725126184283a73822c70b2151098a8adR277

set access in non-MLIR(?) based path:

tensorflow@8684c6b#diff-a01181d08b28a9c7432f22439622f16725126184283a73822c70b2151098a8adR450

This commit merely adds the missing "set" in the MLIR based path
@google-ml-butler google-ml-butler bot added the size:XS CL Change Size: Extra Small label Jan 6, 2021
@google-cla google-cla bot added the cla: yes label Jan 6, 2021
@gbaned gbaned self-assigned this Jan 6, 2021
@gbaned gbaned added the comp:gpu GPU related issues label Jan 6, 2021
@gbaned gbaned added this to Assigned Reviewer in PR Queue via automation Jan 6, 2021
@gbaned gbaned requested a review from chsigg January 6, 2021 15:17
@cheshire
Copy link
Member

cheshire commented Jan 6, 2021

@timshen91 could you take a look?

@timshen91 timshen91 requested review from jurahul and removed request for timshen91 January 6, 2021 19:55
@timshen91
Copy link
Member

Adding @jurahul who authored the original convolution thunk patch.

Copy link
Contributor

@jurahul jurahul left a comment

Choose a reason for hiding this comment

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

Thanks for catching this!

PR Queue automation moved this from Assigned Reviewer to Approved by Reviewer Jan 6, 2021
@google-ml-butler google-ml-butler bot added kokoro:force-run Tests on submitted change ready to pull PR ready for merge process labels Jan 6, 2021
@kokoro-team kokoro-team removed the kokoro:force-run Tests on submitted change label Jan 6, 2021
@copybara-service copybara-service bot merged commit 714d3ed into tensorflow:master Jan 7, 2021
PR Queue automation moved this from Approved by Reviewer to Merged Jan 7, 2021
@deven-amd deven-amd deleted the google_upstream_rocm_xla_conv_fix branch January 26, 2021 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes comp:gpu GPU related issues ready to pull PR ready for merge process size:XS CL Change Size: Extra Small
Projects
PR Queue
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

6 participants