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

dlib: 19.9 -> 19.13 #41953

Merged
merged 1 commit into from Jun 17, 2018
Merged

dlib: 19.9 -> 19.13 #41953

merged 1 commit into from Jun 17, 2018

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 13, 2018 •
edited

Motivation for this change

This fixes the latest dlib build for nixpkgs compliancy:

  • Patched setup.py to use number of jobs defined in $NIX_BUILD_CORES
    rather than using all available cores.

  • Bumped dlib to latest version (v19.13 ATM).

  • Dropped openblas build input, cblas which actually works lives in
    dlib/external. Otherwise the test suite runs into segfaults (see
    dlib: 19.9 -> 19.10 #39255 (comment) for
    further reference).

  • Added myself as maintainer in case of any further breakage in the
    future.

Closes #39255

/cc @dotlambda @ryantm

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ma27
dlib: 19.9 -> 19.13
984bee6 
This fixes the latest `dlib` build for `nixpkgs` compliancy:

* Patched `setup.py` to use number of jobs defined in `$NIX_BUILD_CORES`
  rather than using all available cores.

* Bumped `dlib` to latest version (v19.13 ATM).

* Dropped `openblas` build input, `cblas` which actually works lives in
  `dlib/external`. Otherwise the test suite runs into segfaults (see
  NixOS#39255 (comment) for
  further reference).

* Added myself as maintainer in case of any further breakage in the
  future.

Closes NixOS#39255

/cc @dotlambda @ryantm
@Ma27 Ma27 requested a review from FRidh as a code owner June 13, 2018 23:39
@Ma27
Copy link
Member Author

Ma27 commented Jun 13, 2018

nox-review is still pending, I'll notify you when it's ready :)

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dlib

Partial log (click to expand)

-- Installing: /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13/lib/cmake/dlib/dlib-release.cmake
-- Installing: /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13/lib/cmake/dlib/dlibConfig.cmake
-- Installing: /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13/lib/cmake/dlib/dlibConfigVersion.cmake
-- Installing: /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13/lib/pkgconfig/dlib-1.pc
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13/lib
patching script interpreter paths in /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13
checking for references to /build in /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dlib

Partial log (click to expand)

-- Installing: /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13/lib/cmake/dlib/dlib-release.cmake
-- Installing: /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13/lib/cmake/dlib/dlibConfig.cmake
-- Installing: /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13/lib/cmake/dlib/dlibConfigVersion.cmake
-- Installing: /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13/lib/pkgconfig/dlib-1.pc
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13
strip is /nix/store/qg2agrqkf240s656d207zqhipl0bc2id-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13/lib
patching script interpreter paths in /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13
checking for references to /build in /nix/store/xhxmyz8yybvj3qmf24g1sz3sgxl19g7m-dlib-19.13...

@Ma27
Copy link
Member Author

Ma27 commented Jun 14, 2018

wanted to catch soe sleep last night, but nox-review succeeded then :)

lrwxrwxrwx 1 ma27 users 76 Jun 14 03:57 result -> /nix/store/2z0hqczr8xg5kmnw4fwi330527nq2bc8-python3.6-face_recognition-1.2.2
lrwxrwxrwx 1 ma27 users 64 Jun 14 03:57 result-2 -> /nix/store/a9f1gvy134xdjgl8wag667jalxhrrlc8-python2.7-dlib-19.13
lrwxrwxrwx 1 ma27 users 54 Jun 14 03:57 result-3 -> /nix/store/ciry2d3b4ar3hyjc0nydbdpsqf3qf2d0-dlib-19.13
lrwxrwxrwx 1 ma27 users 64 Jun 14 03:57 result-4 -> /nix/store/5vin2fysxxzhmyjkhwi0r5srzbw4m2d1-python3.6-dlib-19.13
lrwxrwxrwx 1 ma27 users 76 Jun 14 03:57 result-5 -> /nix/store/xldyv3b57xniz07f1azxgckd72qqjfhm-python2.7-face_recognition-1.2.2

@xeji xeji merged commit ccdd229 into NixOS:master Jun 17, 2018
@Ma27 Ma27 deleted the fix-dlib branch June 17, 2018 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ma27 @GrahamcOfBorg @xeji