public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencv3WithoutCuda: init, use where needed

Browse Source 
Most usage of OpenCV is fairly simple (like face recognision or image loading)
so we don't have to force users to compile CUDA-enabled OpenCV for those.
This commit is contained in:
Nikolay Amiantov 2018-02-25 22:13:57 +03:00
parent f6925dbdd8
commit 735e2232a8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/top-level/all-packages.nix
View File

@ -10630,6 +10630,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration;
}; };
opencv3WithoutCuda = opencv3.override {
enableCuda = false;
};
# this ctl version is needed by openexr_viewers # this ctl version is needed by openexr_viewers
openexr_ctl = ctl; openexr_ctl = ctl;
@ -18577,6 +18581,7 @@ with pkgs;
digikam = libsForQt5.callPackage ../applications/graphics/digikam { digikam = libsForQt5.callPackage ../applications/graphics/digikam {
inherit (plasma5) oxygen; inherit (plasma5) oxygen;
inherit (kdeApplications) kcalcore; inherit (kdeApplications) kcalcore;
opencv3 = opencv3WithoutCuda;
}; };
displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {};
@ -19740,9 +19745,7 @@ with pkgs;
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false;
cudnnSupport = cudaSupport; cudnnSupport = cudaSupport;
# Used only for image loading. # Used only for image loading.
opencv3 = self.opencv3.override { opencv3 = opencv3WithoutCuda;
enableCuda = false;
};
}; };
caffe2 = callPackage ../development/libraries/science/math/caffe2 { caffe2 = callPackage ../development/libraries/science/math/caffe2 {
@ -19751,9 +19754,7 @@ with pkgs;
protobuf = protobuf3_1; protobuf = protobuf3_1;
python-protobuf = python3Packages.protobuf3_1; python-protobuf = python3Packages.protobuf3_1;
# Used only for image loading. # Used only for image loading.
opencv3 = self.opencv3.override { opencv3 = opencv3WithoutCuda;
enableCuda = false;
};
}; };
cntk = callPackage ../applications/science/math/cntk rec { cntk = callPackage ../applications/science/math/cntk rec {
@ -19761,9 +19762,7 @@ with pkgs;
cudnnSupport = cudaSupport; cudnnSupport = cudaSupport;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
# Used only for image loading. # Used only for image loading.
opencv3 = self.opencv3.override { opencv3 = opencv3WithoutCuda;
enableCuda = false;
};
}; };
ecm = callPackage ../applications/science/math/ecm { }; ecm = callPackage ../applications/science/math/ecm { };