Fix OpenCL support #21995
Merged
Fix OpenCL support #21995
Conversation
This file contains 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
Patch to search for OpenCL vendor files in Mesa driver link directory.
Split unit tests to a separate package.
* Move OpenCL .icd file to the right place; * Remove libOpenCL.so (we use ocl-icd instead).
7 tasks
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.
Motivation for this change
This makes OpenCL work properly on NixOS.
ocl-icdnow searches for .icd vendor files in/run/opengl-drivers{,32}/etc/OpenCL/vendors. This means that you can add OpenCL drivers tohardware.opengl.extraPackages{,32}and have them available.Also moved Nvidia .icd file to the right place.
This was tested with Beignet and
opencl-info(both architectures); seem to work fine.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)cc @kierdavis