Commit 935338d1 authored by Ben Darwin's avatar Ben Darwin
Browse files

caffe: opencv3 -> opencv4

parent 2a2ba3dc

pkgs/applications/science/math/caffe/default.nix

+8 −2
Original line number Diff line number Diff line 
{ config, stdenv, lib

, fetchFromGitHub

, fetchurl

, fetchpatch

, cmake

, boost

, gflags

, glog

, hdf5-cpp

, opencv3

, opencv4

, protobuf

, doxygen

, blas
@@ -71,7 +72,7 @@ stdenv.mkDerivation rec { 
      ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]

      ++ ["-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 cudnnSupport cudnn

                ++ lib.optional lmdbSupport lmdb
@@ -96,6 +97,11 @@ stdenv.mkDerivation rec { 


  patches = [

    ./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 {

    src = ./python.patch;

    inherit (python.sourceVersion) major minor;  # Should be changed in case of PyPy

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -39829,7 +39829,7 @@ with pkgs; 
  caffe = callPackage ../applications/science/math/caffe ({

    inherit (config) cudaSupport;

    cudaPackages = cudaPackages_10_1;

    opencv3 = opencv3WithoutCuda; # Used only for image loading.

    opencv4 = opencv4WithoutCuda; # Used only for image loading.

    blas = openblas;

    inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;

  } // (config.caffe or {}));