Skip to content

Revert changes for building hwloc on Windows using Ninja generator #1071

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
Merged
merged 4 commits into from
Feb 6, 2025
Merged

Revert changes for building hwloc on Windows using Ninja generator #1071

merged 4 commits into from
Feb 6, 2025

Conversation

ldorau
Copy link
Contributor

@ldorau ldorau commented Feb 4, 2025 •
edited
Loading

Description

Revert changes for building hwloc on Windows:

  1. Fix building hwloc on Windows using the Ninja generator.
  2. Revert commit ada63d7

llvm PR: intel/llvm#16870
llvm build: https://github.com/intel/llvm/actions/runs/13180655339/job/36790352034

Ninja jobs passed:

Fixes: #1057

Checklist

  • Code compiles without errors locally
  • All tests pass locally
  • CI workflows execute properly

@ldorau ldorau requested a review from a team as a code owner February 4, 2025 10:44
@ldorau
Copy link
Contributor Author

ldorau commented Feb 4, 2025

@PatKamin @lukaszstolarczuk @bratpiorka please review

@ldorau
Copy link
Contributor Author

ldorau commented Feb 4, 2025

PR based on the oneapi-src:v0.10.x branch.

@ldorau ldorau marked this pull request as draft February 4, 2025 12:50
@bratpiorka
Copy link
Contributor

please also add the Ninja workflow to our CI

@lukaszstolarczuk
Copy link
Contributor

please also add the Ninja workflow to our CI

heh, you know we had one - it's nightly ICX on Win 😉 Perhaps we could introduce a similar one, but without ICX compiler...? Most likely nightly job should suffice

@bratpiorka
Copy link
Contributor

heh, you know we had one - it's nightly ICX on Win 😉 Perhaps we could introduce a similar one, but without ICX compiler...? Most likely nightly job should suffice

right :) IMO we should add such a workflow to the nightly runs as well

@ldorau ldorau force-pushed the Revert_changes_for_Win_static_hwloc branch from 5218453 to c15c834 Compare February 6, 2025 12:53
@ldorau ldorau changed the base branch from v0.10.x to main February 6, 2025 12:54
@ldorau ldorau force-pushed the Revert_changes_for_Win_static_hwloc branch 4 times, most recently from 8f6fccf to 58ef1da Compare February 6, 2025 14:26
@ldorau ldorau marked this pull request as ready for review February 6, 2025 14:27
@ldorau
Copy link
Contributor Author

ldorau commented Feb 6, 2025

heh, you know we had one - it's nightly ICX on Win 😉 Perhaps we could introduce a similar one, but without ICX compiler...? Most likely nightly job should suffice

right :) IMO we should add such a workflow to the nightly runs as well

Ninja jobs added and passed:

ldorau added 4 commits February 6, 2025 16:18
@ldorau
Fix building hwloc on Windows with Ninja generator
307eb9c 
Fixes: oneapi-src#1057

Co-developed-by: Patryk Kaminski <[email protected]>
Co-developed-by: Lukasz Dorau <[email protected]>

Signed-off-by: Lukasz Dorau <[email protected]>
@ldorau
Add path of umf.dll to DLL_PATH_LIST for tests on Windows
f72f649 
Signed-off-by: Lukasz Dorau <[email protected]>
@ldorau
Revert "Revert changes for Win static hwloc"
eb0fc90 
This reverts commit ada63d7.

Fixes: oneapi-src#1057

Signed-off-by: Lukasz Dorau <[email protected]>
@ldorau
Add Windows-Ninja-cl job to Nightly CI workflow
bfcf8cf 
Co-developed-by: Łukasz Stolarczuk <[email protected]>
Co-developed-by: Lukasz Dorau <[email protected]>

Signed-off-by: Lukasz Dorau <[email protected]>
@ldorau ldorau force-pushed the Revert_changes_for_Win_static_hwloc branch from 58ef1da to bfcf8cf Compare February 6, 2025 15:20
lukaszstolarczuk
lukaszstolarczuk approved these changes Feb 6, 2025
View reviewed changes
Copy link
Contributor

@lukaszstolarczuk lukaszstolarczuk left a comment

Choose a reason for hiding this comment

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

looks good, thx!

@lukaszstolarczuk lukaszstolarczuk merged commit 8be5147 into oneapi-src:main Feb 6, 2025
76 checks passed
@ldorau ldorau deleted the Revert_changes_for_Win_static_hwloc branch February 7, 2025 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bratpiorka bratpiorka bratpiorka approved these changes

@lukaszstolarczuk lukaszstolarczuk lukaszstolarczuk approved these changes

@PatKamin PatKamin Awaiting requested review from PatKamin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Re-enable examples build on Windows with static hwloc
3 participants
@ldorau @bratpiorka @lukaszstolarczuk