Skip to content

SWDEV-1 - Fix a typo #1615

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

Merged
merged 10 commits into from
Nov 3, 2025
Merged

SWDEV-1 - Fix a typo #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eae4b35
SWDEV-1 - Fix a typo
TomSang Oct 29, 2025
be7b202
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Oct 30, 2025
07dd2b8
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Oct 31, 2025
90e8807
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Oct 31, 2025
51babf4
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Oct 31, 2025
3cd12fc
Removing patch
geomin12 Oct 31, 2025
0109a0a
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Nov 1, 2025
f6f6c9a
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Nov 3, 2025
d3246ef
Merge branch 'develop' into users/taosang/SWDEV-1
TomSang Nov 3, 2025
b377e4b
Merge branch 'develop' into users/taosang/SWDEV-1
ScottTodd Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/therock-ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
- name: Fetch sources
timeout-minutes: 30
run: |
rm ./TheRock/patches/amd-mainline/rocm-systems/0010-clr-ClPrint-std-string-to-c-string-fix.patch
./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-rocm-systems --no-include-rocm-libraries --no-include-ml-frameworks


Expand Down
1 change: 1 addition & 0 deletions .github/workflows/therock-ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:

- name: Patch rocm-systems
run: |
rm ./TheRock/patches/amd-mainline/rocm-systems/0010-clr-ClPrint-std-string-to-c-string-fix.patch
git -c user.name="therockbot" -c "[email protected]" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch

- name: Install requirements
Expand Down
3 changes: 1 addition & 2 deletions projects/clr/rocclr/os/os_posix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,7 @@ bool NumaNode::GetAffinity() {
"/cpumap";
std::ifstream file(path);
if (!file) {
std::cerr << "Failed to open " << path << "\n";
ClPrint(amd::LOG_DEBUG, amd::LOG_RESOURCE, "%s cannot be opened", path);
ClPrint(amd::LOG_DEBUG, amd::LOG_RESOURCE, "%s cannot be opened", path.c_str());
Copy link
Member

@ScottTodd ScottTodd Oct 31, 2025

Choose a reason for hiding this comment

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

We had been carrying a patch for this in TheRock (https://github.com/ROCm/TheRock/blob/main/patches/amd-mainline/rocm-systems/0010-clr-ClPrint-std-string-to-c-string-fix.patch - see ROCm/TheRock#1943), so these workflows are failing since the patch no longer applies:

To land this PR we'll need small changes to these workflows to drop the patch:

The changes should look like 36a1fd8, using this code:

rm ./TheRock/patches/amd-mainline/rocm-systems/0010-clr-ClPrint-std-string-to-c-string-fix.patch

return false;
}
std::string line;
Expand Down
Loading