Skip to content

[rocWMMA] 7.10 cherry picks#2936

Merged
idass1990 merged 6 commits into
release/therock-7.10from
users/bsyrowik/rel_7.10_cherry_picks
Nov 27, 2025
Merged

[rocWMMA] 7.10 cherry picks#2936
idass1990 merged 6 commits into
release/therock-7.10from
users/bsyrowik/rel_7.10_cherry_picks

Conversation

@bsyrowik
Copy link
Copy Markdown
Contributor

Motivation

This PR cherry-picks patches from develop into the release/therock-7.10 branch that make the following changes:

  • Avoid a cmake configuration error when using the Ninja build system.
  • Ensure the RPATH is set properly for tests and samples regardless of whether Make or Ninja is used.
  • Fix two issues with the Windows standalone build
  • Handle explicitly empty target selection elegantly
  • Reduce the number of ELF sections in test binaries to enable python packaging

Technical Details

PRs for these changes on the develop branch are here:

Test Plan

Test Result

Submission Checklist

bsyrowik and others added 6 commits November 26, 2025 10:26
## Motivation

Long-term rocWMMA fix for ROCm/TheRock#2136

## Technical Details

<!-- Explain the changes along with any relevant GitHub links. -->

## Test Plan

<!-- Explain any relevant testing done to verify this PR. -->

## Test Result

<!-- Briefly summarize test outcomes. -->

## Submission Checklist

- [ ] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
## Motivation

Without adding `FORCE`, we don't actually override an explicitly empty
`GPU_TARGETS`.

## Technical Details

<!-- Explain the changes along with any relevant GitHub links. -->

## Test Plan

<!-- Explain any relevant testing done to verify this PR. -->

## Test Result

<!-- Briefly summarize test outcomes. -->

## Submission Checklist

- [ ] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
## Motivation

Use CMAKE to set RPATH to avoid differences between Make and Ninja

## Technical Details

<!-- Explain the changes along with any relevant GitHub links. -->

## Test Plan

Compile with both Make and Ninja, check RPATH.

## Test Result

RPATH now set properly in both cases.

## Submission Checklist

- [x] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
#2848)

## Motivation

Building rocWMMA as part of TheRock on Windows worked fine, but when
trying to do a standalone build we run into issues with GTest. The
MinSizeRel build was also broken on Windows.

## Technical Details

This change sets a GTest CMake variable to ensure we build the GTest
_static_ library so that it _dynamically_ links against the C runtime if
we are building the tests as dynamic binaries.

Also make sure we don't remove important automatically-added build flags
for the MinSizeRel build on Windows.

## Test Plan

Manual testing on Windows.

## Test Result

Executables linked and ran properly.

## Submission Checklist

- [ ] Look over the contributing guidelines at
https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
@bsyrowik
Copy link
Copy Markdown
Contributor Author

I expect that the rocWMMA tests will timeout, based on which version of TheRock we are using on the 7.10 branch.

It is set up with 15min timeout for "full" and 5min for "smoke", and likely running without rocBLAS.

Copy link
Copy Markdown
Contributor

@evedovelli evedovelli left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Contributor

@Ryker0627 Ryker0627 left a comment

Choose a reason for hiding this comment

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

lgtm

@HereThereBeDragons
Copy link
Copy Markdown
Contributor

can you please merge it if it is good and the test timeouts are not an issue? @evedovelli @bsyrowik @Ryker0627
i dont have rights for it, and we would need it so we can bump the submodule in the release branch in therock.

@HereThereBeDragons
Copy link
Copy Markdown
Contributor

also please note that the CI checked out theRock/main and not release/therock-7.10.
so either we can try bumping after merging and see if all is green or we need to fix and rerun the CI to check out the right therock branch.

adjustment probably need to be done at least here:

ref: a1f6b57cc31890c05ab0094212ae0b269765db8e # 2025-11-25 commit
and same for windows

@bsyrowik
Copy link
Copy Markdown
Contributor Author

also please note that the CI checked out theRock/main and not release/therock-7.10. so either we can try bumping after merging and see if all is green or we need to fix and rerun the CI to check out the right therock branch.

adjustment probably need to be done at least here:

ref: a1f6b57cc31890c05ab0094212ae0b269765db8e # 2025-11-25 commit

and same for windows

I've bumped the refs on top of this PR here: #2971

In the meantime, I'm inclined to check this in so it is done. I'll talk to the gardeners. The test status looks good to me: it is fully passing on Windows, and the Linux tests are all running and passing to the point where they are killed by the timeout. In addition, this PR includes ~ all of the functional changes from the develop branch since 7.10 was branched off, so this branch and develop are functionally in about the same place. Math CI, Azure CI, and TheRock CI are all passing on develop.

@HereThereBeDragons
Copy link
Copy Markdown
Contributor

To fix the CI on release branch to check out the correct TheRock, please merge when the build is green: #2962

@idass1990 idass1990 merged commit 5410f6e into release/therock-7.10 Nov 27, 2025
14 of 19 checks passed
@idass1990 idass1990 deleted the users/bsyrowik/rel_7.10_cherry_picks branch November 27, 2025 18:28
HereThereBeDragons pushed a commit to ROCm/TheRock that referenced this pull request Nov 28, 2025
bump rocm-libraries from release/therock-7.10 20251127 

Includes cherry picks :

ROCm/rocm-libraries#2873

ROCm/rocm-libraries#2936

Co-authored-by: aravind-ravi1206 <therockbot@amd.com>
tfalders pushed a commit to tfalders/rocm-libraries that referenced this pull request Jan 21, 2026
To enable the json dump we can now build with -DCK_ENABLE_JSON_DUMP=1
ammallya pushed a commit that referenced this pull request Feb 3, 2026
To enable the json dump we can now build with -DCK_ENABLE_JSON_DUMP=1

[ROCm/composable_kernel commit: e92e693]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants