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.

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

Jump to bottom

OpenCL things #34797

Merged
merged 5 commits into from Feb 12, 2018
Merged

OpenCL things #34797

merged 5 commits into from Feb 12, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Feb 10, 2018

Motivation for this change

Side-effect of me doing OpenCL things.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

FRidh
FRidh reviewed Feb 10, 2018
View reviewed changes
pkgs/development/libraries/hwloc/default.nix Outdated
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
# derivation and set optional dependencies to `null'.
buildInputs = stdenv.lib.filter (x: x != null)
([ expat ncurses ]
++ (optionals x11Support [ cairo libX11 ])
++ (optionals x11Support [ libX11 cairo ])
Copy link
Member

Choose a reason for hiding this comment

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

accidental?

@oxij
Copy link
Member Author

oxij commented Feb 10, 2018 via email

@FRidh
Copy link
Member

FRidh commented Feb 10, 2018

Changes like that are just noise for reviewers, please don't do that.

@oxij
Copy link
Member Author

oxij commented Feb 10, 2018 via email

@fpletz
Copy link
Member

fpletz commented Feb 12, 2018

@GrahamcOfBorg build ocl-icd

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘ocl-icd-2.2.10’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/development/libraries/ocl-icd/default.nix:21 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

make[3]: Leaving directory '/build/ocl-icd-2.2.10/tests'
make[2]: Leaving directory '/build/ocl-icd-2.2.10/tests'
make[1]: Leaving directory '/build/ocl-icd-2.2.10'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hz5mx7f8w9f8nlmskxdbx2gdkkbh5as9-ocl-icd-2.2.10
shrinking /nix/store/hz5mx7f8w9f8nlmskxdbx2gdkkbh5as9-ocl-icd-2.2.10/lib/libOpenCL.so.1.0.0
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/hz5mx7f8w9f8nlmskxdbx2gdkkbh5as9-ocl-icd-2.2.10/lib
patching script interpreter paths in /nix/store/hz5mx7f8w9f8nlmskxdbx2gdkkbh5as9-ocl-icd-2.2.10
checking for references to /build in /nix/store/hz5mx7f8w9f8nlmskxdbx2gdkkbh5as9-ocl-icd-2.2.10...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

make[2]: Leaving directory '/build/ocl-icd-2.2.10/tests'
make[1]: Leaving directory '/build/ocl-icd-2.2.10'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10
shrinking /nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10/lib/libOpenCL.so.1.0.0
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10/lib
patching script interpreter paths in /nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10
checking for references to /build in /nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10...
/nix/store/h03hcc81sb8xk6vxjzs40zs0c9ncidni-ocl-icd-2.2.10

@fpletz fpletz merged commit cb02fae into NixOS:master Feb 12, 2018
@oxij
Copy link
Member Author

oxij commented Feb 12, 2018

Thanks!

@oxij oxij deleted the pkgs/opencl-things branch September 8, 2018 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@oxij @FRidh @fpletz @GrahamcOfBorg