diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-03 14:55:57 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-07 17:04:29 +0300 |
| commit | 88641353d6a6c9233241c10e2c1739285a1f3baa (patch) | |
| tree | ebc0749023ed5b7ea18136f6faffee48efc37f08 /pkgs/applications/science/math/caffe | |
| parent | 1704eeb9306e33b57d85c4e554a612a6191c7f28 (diff) | |
| download | nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar.gz nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar.bz2 nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar.lz nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar.xz nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.tar.zst nixlib-88641353d6a6c9233241c10e2c1739285a1f3baa.zip | |
caffe: 2015-07-02 -> 1.0-rc5
Diffstat (limited to 'pkgs/applications/science/math/caffe')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index fc7d96115294..9773c30d6d8d 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -4,7 +4,7 @@ , cudaSupport ? true , cudnnSupport ? false , cudnn ? null -, cudatoolkit7 +, cudatoolkit , fetchFromGitHub , google-gflags , glog @@ -19,29 +19,31 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { - # Use git revision because latest "release" is really old - name = "caffe-git-2015-07-02"; + name = "caffe-${version}"; + version = "1.0-rc5"; src = fetchFromGitHub { owner = "BVLC"; repo = "caffe"; - rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f"; - sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx"; + rev = "rc5"; + sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c"; }; preConfigure = "mv Makefile.config.example Makefile.config"; - makeFlags = "BLAS=open " + - (if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") + - (if cudnnSupport then "USE_CUDNN=1 " else ""); + makeFlags = [ "BLAS=open" + (if !cudaSupport then "CPU_ONLY=1" else "CUDA_DIR=${cudatoolkit}") ] + ++ optional cudnnSupport "USE_CUDNN=1"; # too many issues with tests to run them for now doCheck = false; - checkPhase = "make runtest ${makeFlags}"; + checkTarget = "runtest"; + + enableParallelBuilding = true; buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv protobuf snappy ] - ++ optional cudaSupport cudatoolkit7 + ++ optional cudaSupport cudatoolkit ++ optional cudnnSupport cudnn; installPhase = '' |