diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-03-31 10:47:18 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-17 16:24:09 -0500 |
| commit | 1c8aba83340be3713f68410d1d273a8b15e7e007 (patch) | |
| tree | fdc752744f384be57b6ff3c65495018432bff0ab /pkgs/development/libraries/opencv | |
| parent | 43873351ffed36b52170571839e26b57c9f15920 (diff) | |
| download | nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.gz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.bz2 nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.lz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.xz nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.tar.zst nixpkgs-1c8aba83340be3713f68410d1d273a8b15e7e007.zip | |
treewide: use blas and lapack
This makes packages use lapack and blas, which can wrap different BLAS/LAPACK implementations. treewide: cleanup from blas/lapack changes A few issues in the original treewide: - can’t assume blas64 is a bool - unused commented code
Diffstat (limited to 'pkgs/development/libraries/opencv')
| -rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index ed337c7ebfe..6f327ca396a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,6 +35,8 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "3.4.8"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index cec8a9aa363..abec6e1ace5 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,6 +35,8 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "4.1.2"; |