Skip to content

[SYCL] Fix missing dependency on UR headers #16261

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 2 commits into from
Dec 4, 2024

Conversation

ldrumm
Copy link
Contributor

@ldrumm ldrumm commented Dec 4, 2024

No description provided.

@ldrumm ldrumm requested a review from a team as a code owner December 4, 2024 14:56
@ldrumm ldrumm requested a review from uditagarwal97 December 4, 2024 14:56
@ldrumm
Copy link
Contributor Author

ldrumm commented Dec 4, 2024

As discussed in this unrelated patch, changing the UR headers is not properly reflected in the build graph.

@sarnex

@ldrumm ldrumm requested a review from sarnex December 4, 2024 14:57
@@ -243,6 +243,11 @@ add_custom_target(sycl-headers
sycl-device-aspect-macros-header
boost_mp11-headers)

list(APPEND UR_HEADERS
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like UR_HEADERS is originally defined in UR itself here and these three files are UR files, should the fix instead be in UR itself rather than SYCL? This is fine as a temporary fix though

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The fix is really not to copy headers to sycl's build directory in the first place, but use target_include_directories(PRIVATE. The whole way we do dependencies isn't proper cmake, and I need to flense the whole thing. This is temporary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could change that variable name, though. Didn't realise it clashed

Copy link
Contributor

Choose a reason for hiding this comment

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

i dont know enough about cmake anyway, i thought it was intentionally clashing :P

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated to use the delightfully quaint "UR_HEADERS_TO_COPY"

Copy link
Contributor

@sarnex sarnex left a comment

Choose a reason for hiding this comment

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

lgtm as temp fix

@ldrumm ldrumm merged commit 6d2fa74 into intel:sycl Dec 4, 2024
14 checks passed
@ldrumm ldrumm deleted the missing-header-depends branch December 4, 2024 20:29
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.

3 participants