Skip to content

Minor fixes around hwloc in CMake and CI #667

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

Merged
merged 3 commits into from
Aug 14, 2024

Conversation

lukaszstolarczuk
Copy link
Contributor

@lukaszstolarczuk lukaszstolarczuk commented Aug 8, 2024

A small fixes in CMake and CI around hwloc options.

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

@lukaszstolarczuk lukaszstolarczuk requested a review from a team as a code owner August 8, 2024 10:48
@lukaszstolarczuk lukaszstolarczuk force-pushed the fixes-around-hwloc branch 2 times, most recently from da2e159 to 267b0f1 Compare August 9, 2024 14:19
CMakeLists.txt Outdated
@@ -52,6 +52,10 @@ option(
UMF_LINK_HWLOC_STATICALLY
"Link UMF with HWLOC library statically (supported for Linux, MacOS and Release build on Windows)"
OFF)
option(
Copy link
Contributor

@ldorau ldorau Aug 12, 2024

Choose a reason for hiding this comment

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

Maybe move UMF_DISABLE_HWLOC before UMF_LINK_HWLOC_STATICALLY ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

Copy link
Contributor

@ldorau ldorau left a comment

Choose a reason for hiding this comment

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

Rebase please.

Maybe move UMF_DISABLE_HWLOC before UMF_LINK_HWLOC_STATICALLY in CMake options?

print general info when hwloc is disabled (not only for examples),
remove the dead code when DLL_PATH_LIST would be set with empty var,
print hwloc variables only once.
"default" params are not propagated into include's.
@lukaszstolarczuk lukaszstolarczuk merged commit e67c4e1 into oneapi-src:main Aug 14, 2024
65 checks passed
@lukaszstolarczuk lukaszstolarczuk deleted the fixes-around-hwloc branch August 14, 2024 09:55
lukaszstolarczuk added a commit to lukaszstolarczuk/unified-memory-framework that referenced this pull request Aug 19, 2024
Around changes in oneapi-src#667, perhaps in merge conflict resolution
extra hwloc configure params were accidentally removed (ref. 660).
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.

4 participants