cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

caffe: opencv3 -> opencv4

Browse source
This commit is contained in:
Ben Darwin 2023-09-21 13:27:24 -04:00
parent 2a2ba3dc3f
commit 935338d123
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/science/math/caffe/default.nix
View file

@ -1,12 +1,13 @@
{ config, stdenv, lib { config, stdenv, lib
, fetchFromGitHub , fetchFromGitHub
, fetchurl , fetchurl
, fetchpatch
, cmake , cmake
, boost , boost
, gflags , gflags
, glog , glog
, hdf5-cpp , hdf5-cpp
, opencv3 , opencv4
, protobuf , protobuf
, doxygen , doxygen
, blas , blas
@ -71,7 +72,7 @@ stdenv.mkDerivation rec {
++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; ++ ["-DUSE_LMDB=${toggle lmdbSupport}"];
buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ]
++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudaSupport cudatoolkit
++ lib.optional cudnnSupport cudnn ++ lib.optional cudnnSupport cudnn
++ lib.optional lmdbSupport lmdb ++ lib.optional lmdbSupport lmdb
@ -96,6 +97,11 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./darwin.patch ./darwin.patch
(fetchpatch {
name = "support-opencv4";
url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";
hash = "sha256-ZegTvp0tTHlopQv+UzHDigs6XLkP2VfqLCWXl6aKJSI=";
})
] ++ lib.optional pythonSupport (substituteAll { ] ++ lib.optional pythonSupport (substituteAll {
src = ./python.patch; src = ./python.patch;
inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy

2
pkgs/top-level/all-packages.nix
View file

@ -39829,7 +39829,7 @@ with pkgs;
caffe = callPackage ../applications/science/math/caffe ({ caffe = callPackage ../applications/science/math/caffe ({
inherit (config) cudaSupport; inherit (config) cudaSupport;
cudaPackages = cudaPackages_10_1; cudaPackages = cudaPackages_10_1;
opencv3 = opencv3WithoutCuda; # Used only for image loading. opencv4 = opencv4WithoutCuda; # Used only for image loading.
blas = openblas; blas = openblas;
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
} // (config.caffe or {})); } // (config.caffe or {}));