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

rocclr: fix build (no OpenCL library is required) #94871

Merged
merged 1 commit into from Aug 7, 2020

Conversation

danieldk
Copy link
Contributor

@danieldk danieldk commented Aug 7, 2020

Motivation for this change

rocclr builds fail since CMake was upgraded to 3.18. This version
introduces the REQUIRED option of find_library. However rocclr only
needs OpenCL headers. This change makes finding an OpenCL library
optional again.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

rocclr builds fail since CMake was upgraded to 3.18. This version
introduces the REQUIRED option of find_library. However rocclr only
needs OpenCL headers. This change makes finding an OpenCL library
optional again.
@danieldk
Copy link
Contributor Author

danieldk commented Aug 7, 2020

@ofborg build rocm-opencl-icd

@acowley
Copy link
Contributor

acowley commented Aug 7, 2020

Something I noticed when fixing this in the overlay is that there is a warning or error printed by the cmake setup-hook.sh. It can be fixed by setting a variable in the derivation, but it’s a bit worrying. I fixed it in the overlay, but I’ll back out my changes to adopt yours regarding this fix and ping you on a PR for just that change.

@danieldk
Copy link
Contributor Author

danieldk commented Aug 7, 2020

Something I noticed when fixing this in the overlay is that there is a warning or error printed by the cmake setup-hook.sh.

I noticed that too, the grep error, right? I think it stems from this PR:

#93166 (comment)

@danieldk danieldk merged commit f99f5bf into NixOS:master Aug 7, 2020
@danieldk danieldk deleted the rocclr-fix branch August 7, 2020 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants