Skip to content

[SYCL][CUDA] Add missing dependency on OpenCL headers #1260

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

Merged
merged 1 commit into from
Mar 6, 2020
Merged

[SYCL][CUDA] Add missing dependency on OpenCL headers #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions sycl/plugins/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ add_library(pi_cuda SHARED
"pi_cuda.cpp"
)

add_dependencies(pi_cuda
ocl-headers
)
Copy link
Contributor

Choose a reason for hiding this comment

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

Another solution could be to make the llvm/sycl/CMakeLists.txt OpenCL-Headers library (used below) dependent on the custom target ocl-headers - though without testing I am not 100% sure if that would resolve this issue, too.

Copy link
Contributor

Choose a reason for hiding this comment

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

It might not.
Basically we need to make sure that ocl-headers target to "built" before we start compilation of CUDA plug-in.

Copy link
Contributor

Choose a reason for hiding this comment

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

To chime in, a bit late...

This was indeed the correct solution in my mind. Setting dependencies on interface libraries (which OpenCL-Headers is) is not possible. CMake just silently doesn't do anything for the dependency in that case. (I've been bit by this before...)


add_dependencies(sycl-toolchain pi_cuda)

set_target_properties(pi_cuda PROPERTIES LINKER_LANGUAGE CXX)
Expand Down