Skip to content

[rocm6.4_internal_testing] Replaced ROCm specific skips to generalized conditions #2100

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

Conversation

iupaikov-amd
Copy link

@iupaikov-amd iupaikov-amd commented May 8, 2025

It's an internal change, removes unnecessary arch mentions and generalizes conditions.

Needs to be cherry-picked into rocm6.5_internal_testing and release/2.7

Cherry-picked to release/2.6 branch via #2260

Cherry-picked to release/2.5 branch via #2261

Cherry-picked to release/2.5 branch via #2262

@rocm-repo-management-api
Copy link

rocm-repo-management-api bot commented May 8, 2025

Jenkins build for d98fc67a7dfdce9665b6c5a05acdaeea8ea82a67 commit finished as FAILURE
Links: Blue Ocean view / Build artifacts

@iupaikov-amd iupaikov-amd self-assigned this May 8, 2025
@unittest.skipIf(IS_FBCODE, "Not yet runnable in fbcode")
@unittest.skipIf(not SM80OrLater, "bfloat16 only supported in sm80+")
@unittest.skipIf(not PLATFORM_SUPPORTS_FLASH_ATTENTION, "Some archs don't support SDPA")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this test fail when using math backend on CUDA as well?

Choose a reason for hiding this comment

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

I observed that if we force math backend in MI300 and even at A100 for exactly this test, it fails.
see: https://github.com/ROCm/frameworks-internal/issues/11952
there you can also find an upstream pytorch issue I filed..

But the logic here is clear:

  • If FA (goes into AOTriton) is not supported, then code goes into math backend and fails and there's nothing we can do about it (until upstream fixes math backend) -> must skip the test
  • If FA is enabled (this depends on the architecture and/or if TORCH_ROCM_AOTRITON_ENABLE_EXPERIMENTAL is set, see:
    def evaluate_platform_supports_flash_attention():

@@ -1361,16 +1361,6 @@ def printErrors(self) -> None:
IS_ARM64 = platform.machine() in ('arm64', 'aarch64')
IS_S390X = platform.machine() == "s390x"

NAVI32_ARCH = "gfx1101"

def is_navi_arch():
Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe you have checked nobody is using this function.

Copy link
Author

Choose a reason for hiding this comment

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

Yeah, it was introduced by me in previous cherry-pick

@pruthvistony pruthvistony merged commit 4e4e339 into rocm6.4_internal_testing May 12, 2025
0 of 2 checks passed
@pruthvistony pruthvistony deleted the iupaikov_sdpa_skips_generalization_rocm6.4_internal_testing branch May 12, 2025 19:19
@iupaikov-amd
Copy link
Author

!cherry-pick --onto release/2.7

@iupaikov-amd
Copy link
Author

!cherry-pick --onto rocm6.5_internal_testing

@okakarpa
Copy link
Collaborator

Created branch autogenerated/release/2.7_cherry-pick_pr-2100 and #2126. It contains a merge conflict. Please resolve it

@okakarpa
Copy link
Collaborator

Can't perform the cherry-pick keyword: unexpected error

@okakarpa
Copy link
Collaborator

Created branch autogenerated/rocm6.5_internal_testing_cherry-pick_pr-2100 and #2127. It contains a merge conflict. Please resolve it

@okakarpa
Copy link
Collaborator

Can't perform the cherry-pick keyword: unexpected error

AmdSampsa pushed a commit that referenced this pull request May 19, 2025
…d conditions (#2100)

It's an internal change, removes unnecessary arch mentions and
generalizes conditions.

Needs to be cherry-picked into rocm6.5_internal_testing and release/2.7

.and now also into release/2.6
pruthvistony pushed a commit that referenced this pull request May 29, 2025
… Replaced ROCm specific skips to generalized conditions (#2127)

Cherry-pick of #2100 
Need to resolve conflicts

---------

Co-authored-by: iupaikov-amd <[email protected]>
pruthvistony pushed a commit that referenced this pull request May 29, 2025
…m specific skips to generalized conditions (#2126)

Cherry-pick of #2100 
Need to resolve conflicts

---------

Co-authored-by: iupaikov-amd <[email protected]>
@jataylo
Copy link

jataylo commented Jun 10, 2025

!cherry-pick --onto release/2.6

@okakarpa
Copy link
Collaborator

Created branch autogenerated/release/2.6_cherry-pick_pr-2100 and #2260. It contains a merge conflict. Please resolve it

@jataylo
Copy link

jataylo commented Jun 10, 2025

!cherry-pick --onto release/2.5

1 similar comment
@jataylo
Copy link

jataylo commented Jun 10, 2025

!cherry-pick --onto release/2.5

@okakarpa
Copy link
Collaborator

Created branch autogenerated/release/2.5_cherry-pick_pr-2100 and #2261. It contains a merge conflict. Please resolve it

@okakarpa
Copy link
Collaborator

Created branch autogenerated/release/2.5_cherry-pick_pr-2100 and #2262. It contains a merge conflict. Please resolve it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants