Skip to content
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

[OpenCL] Use older OpenCL-Headers commit to fix build #2067

Merged
merged 1 commit into from
Sep 6, 2024

Conversation

sarnex
Copy link
Contributor

@sarnex sarnex commented Sep 6, 2024

Build in DPCPP is broken because of the below error caused by the upstream headers change.

Just use the previous commit from the one that breaks the build until the adapter code can be updated.

 In file included from /__w/llvm/llvm/build/_deps/unified-runtime-src/source/adapters/opencl/adapter.cpp:11:
/__w/llvm/llvm/build/_deps/unified-runtime-src/source/adapters/opencl/common.hpp:317:29: error: 'cl_mutable_base_config_khr' does not name a type; did you mean 'cl_mutable_dispatch_config_khr'?
  317 |                       const cl_mutable_base_config_khr *mutable_config);

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
@sarnex
Copy link
Contributor Author

sarnex commented Sep 6, 2024

@oneapi-src/unified-runtime-opencl-write @EwanC

DPCPP build is broken because of this issue so a fast review is appreciated. After this I have to bump the DPCPP version of UR which hopefully wont break anything else

@callumfare
Copy link
Contributor

@sarnex Thanks for the quick fix. We're already using the latest UR commit on intel/llvm so bumping it after this merges shouldn't be an issue

@sarnex
Copy link
Contributor Author

sarnex commented Sep 6, 2024

@callumfare Thanks, do you have permission to force merge this without CI? I want to fix DPCPP as fast as possible.

@callumfare callumfare merged commit a99dbce into oneapi-src:main Sep 6, 2024
66 checks passed
@callumfare
Copy link
Contributor

@sarnex I've merged, worst case we can revert it but it should be a very safe change

@sarnex
Copy link
Contributor Author

sarnex commented Sep 6, 2024

Thanks!

@haonanya
Copy link

Do we have plan to Update adapters/opencl/common.hpp to align with latest change of opencl header? @callumfare, @martygrant, filed #2122, thanks.

@EwanC
Copy link
Contributor

EwanC commented Sep 24, 2024

Do we have plan to Update adapters/opencl/common.hpp to align with latest change of opencl header? @callumfare, @martygrant, filed #2122, thanks.

Hi I missed that this issue has been filed so didn't reference it, but #2095 should do this

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