-
Notifications
You must be signed in to change notification settings - Fork 35
Add test for FetchContent of UMF on Linux and Windows #1384
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
base: main
Are you sure you want to change the base?
Add test for FetchContent of UMF on Linux and Windows #1384
Conversation
afd45b5
to
cd0640d
Compare
cd0640d
to
09fb801
Compare
09fb801
to
8bb3ebc
Compare
Rebased |
8bb3ebc
to
9906125
Compare
Rebased |
9906125
to
4e4194a
Compare
4e4194a
to
64a6257
Compare
@@ -0,0 +1,64 @@ | |||
# Copyright (C) 2025 Intel Corporation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a general note, not neccessarily needed to be done in this PR - so now, as we test it, perhaps we should add a README section about integration (e.g. like in UR repo: https://github.com/oneapi-src/unified-runtime?tab=readme-ov-file#integration)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can consider that. The question is if it should be the recommended way to integrate UMF.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm yeah, probably we shouldn't say that it's recommended
64a6257
to
b28de77
Compare
b28de77
to
e2286df
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in general LGTM
.github/workflows/nightly.yml
Outdated
- name: Run the fetch_content example | ||
shell: cmd | ||
working-directory: ${{github.workspace}}/examples/fetch_content/build | ||
run: dir .\umf_example_fetch_content.exe |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why dir
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It fails for unknown reason
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suppose a path to a DLL is missing ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lukaszstolarczuk Fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -201,6 +238,32 @@ jobs: | |||
${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}} | |||
${{ matrix.static_hwloc == 'ON' && '--hwloc' || '' }} | |||
|
|||
- name: Set VCPKG_PATH with hwloc for the fetch_content example |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we already have a step like this, I guess we could just do the same as in that step: add if: matrix.static_hwloc == 'OFF'
to the fetch_content example's configure/build/execution steps
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fetch_content example always requires hwloc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I'm just saying, we could test that example only in cases where the job already have VCPKG_PATH set
# Copyright (C) 2025 Intel Corporation | ||
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT. | ||
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you could add a short description why do we have this example
@@ -0,0 +1,64 @@ | |||
# Copyright (C) 2025 Intel Corporation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm yeah, probably we shouldn't say that it's recommended
target_include_directories(${EXAMPLE_NAME} PRIVATE ${LIBUMF_INCLUDE_DIRS}) | ||
target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS}) | ||
target_link_libraries(${EXAMPLE_NAME} PRIVATE ${LIBUMF_LIBRARIES} hwloc) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you please add printing of PATHs found in this example and used above..?
// e.g. like here: https://github.com/lukaszstolarczuk/unified-memory-framework/actions/runs/16051712582/job/45295762065#step:11:4353
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which paths exactly do you mean?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mostly which umf is used (so LIBUMF_INCLUDE_DIRS
, but also btw we could print LIBHWLOC_LIBRARY_DIRS
and LIBUMF_LIBRARIES
) - see my example CI run (link above)
e2286df
to
c666f12
Compare
Test FetchContent of UMF on Linux and Windows in Nightly CI job - on Windows with the 'Ninja' and 'NMake Makefiles' generators. Add the fetch_content example based on the basic example. Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
c666f12
to
1a033d4
Compare
Description
Test FetchContent of UMF on Linux and Windows -
on Windows with the 'Ninja' and 'NMake Makefiles' generators.
Add the fetch_content example based on the basic example.
Nightly CI build: https://github.com/ldorau/unified-memory-framework/actions/runs/16030235338
Checklist