[SYCL][NativeCPU][CMake] Simplify OCK CMake handling #19704
+23
−27
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sarnie, Nick <[email protected]>
uwedolinsky
reviewed
Aug 5, 2025
| ) | ||
| FetchContent_GetProperties(oneapi-ck) | ||
| if(NOT oneapi-ck_POPULATED) | ||
| message(STATUS "Cloning oneAPI Construction Kit from ${OCK_GIT_INTERNAL_REPO}, tag ${OCK_GIT_INTERNAL_TAG}") | ||
| if(FETCHCONTENT_SOURCE_DIR_ONEAPI-CK) | ||
| message(STATUS "Using specified oneAPI Consutrction Kit repo location at ${FETCHCONTENT_SOURCE_DIR_ONEAPI-CK}") |
There was a problem hiding this comment.
Consutrction -> Construction
coldav
reviewed
Aug 5, 2025
| @@ -31,8 +27,16 @@ if(NOT "native_cpu" IN_LIST SYCL_ENABLE_BACKENDS) | |||
| endif() | |||
|
|
|||
| if(NATIVECPU_USE_OCK) | |||
| if(NATIVECPU_OCK_USE_FETCHCONTENT) | |||
| set(OCK_GIT_INTERNAL_REPO "https://github.com/uxlfoundation/oneapi-construction-kit.git") | |||
| set(OCK_SEARCH_LOC "oneapi-construction-kit/compiler_passes") | |||
There was a problem hiding this comment.
I'm not overly convinced we should keep OCK_SEARCH_LOC since it was a convenience and isn't really tested. Feel free to keep though.
coldav
approved these changes
Aug 5, 2025
coldav
approved these changes
Aug 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm trying to make this repo more easily packaged by Linux distros, and OCK came up in some feedback from NixOS (see linked issue).
Overall, the external dependency behavior should work as follows:
OCK seems a bit special because installing OCK locally doesn't seem to install any CMake files nor does it install the files required to use it to build NativeCPU support. Seems we actually need the git tree, not the installed result of a built OCK. Strange but let's go with it.
You can already provide a precreated clone to use to build with
FetchContentusingFETCHCONTENT_SOURCE_DIR_<uppercaseName>, so there is no need for variable to set the directory and a custom repo and tag.Remove variables that duplicate functionality that already exists in
FetchContent, and add a simple search for the source directory on the system.Issue: #19635