Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 976cb854fd0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f7e55ff5d78
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 12, 2020

  1. added cuda cmake flags (allows GPU acceleration of some of the librar… 

    …ies functions)
    @alexanderwatanabe
    alexanderwatanabe committed Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    GPG key ID: 0437A96EFE4C426E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c45155d View commit details

  2. Merge pull request #85089 from alexanderwatanabe/master 

    CUDA support
    @Ma27
    Ma27 authored Apr 12, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    siriobalmelli Sirio Balmelli
    GPG key ID: 0437A96EFE4C426E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7f7e55f View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 pkgs/development/libraries/dlib/default.nix
5 changes: 4 additions & 1 deletion pkgs/development/libraries/dlib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

# see http://dlib.net/compile.html
, avxSupport ? true
, cudaSupport ? true
}:

stdenv.mkDerivation rec {
@@ -20,7 +21,9 @@ stdenv.mkDerivation rec {
rm -rf dlib/external
'';

cmakeFlags = [ "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];
cmakeFlags = [
"-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}"
"-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ];

enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ];