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

caffe: 2015-07-02 -> 1.0-rc5

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-09-03 14:55:57 +03:00
parent 1704eeb930
commit 88641353d6
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/science/math/caffe/default.nix
View File

@ -4,7 +4,7 @@
, cudaSupport ? true , cudaSupport ? true
, cudnnSupport ? false , cudnnSupport ? false
, cudnn ? null , cudnn ? null
, cudatoolkit7 , cudatoolkit
, fetchFromGitHub , fetchFromGitHub
, google-gflags , google-gflags
, glog , glog
@ -19,29 +19,31 @@
let optional = stdenv.lib.optional; let optional = stdenv.lib.optional;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
# Use git revision because latest "release" is really old name = "caffe-${version}";
name = "caffe-git-2015-07-02"; version = "1.0-rc5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BVLC"; owner = "BVLC";
repo = "caffe"; repo = "caffe";
rev = "77d66dfc907dd875d69bb9fc12dd950b531e464f"; rev = "rc5";
sha256 = "0vd4qrc49dhsawj298xpkd5mvi35sh56kdswx3yp8ya4fjajwakx"; sha256 = "0lfmmc0n6xvkpygvxclzrvd0zigb4yfc5612anv2ahlxpfi9031c";
}; };
preConfigure = "mv Makefile.config.example Makefile.config"; preConfigure = "mv Makefile.config.example Makefile.config";
makeFlags = "BLAS=open " + makeFlags = [ "BLAS=open"
(if !cudaSupport then "CPU_ONLY=1 " else "CUDA_DIR=${cudatoolkit7} ") + (if !cudaSupport then "CPU_ONLY=1" else "CUDA_DIR=${cudatoolkit}") ]
(if cudnnSupport then "USE_CUDNN=1 " else ""); ++ optional cudnnSupport "USE_CUDNN=1";
# too many issues with tests to run them for now # too many issues with tests to run them for now
doCheck = false; doCheck = false;
checkPhase = "make runtest ${makeFlags}"; checkTarget = "runtest";
enableParallelBuilding = true;
buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv buildInputs = [ openblas boost google-gflags glog hdf5 leveldb lmdb opencv
protobuf snappy ] protobuf snappy ]
++ optional cudaSupport cudatoolkit7 ++ optional cudaSupport cudatoolkit
++ optional cudnnSupport cudnn; ++ optional cudnnSupport cudnn;
installPhase = '' installPhase = ''

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

@ -18456,8 +18456,10 @@ with pkgs;
### SCIENCE / MATH ### SCIENCE / MATH
caffe = callPackage ../applications/science/math/caffe { caffe = callPackage ../applications/science/math/caffe rec {
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true; cudaSupport = config.caffe.cudaSupport or config.cudaSupport or true;
# CUDA 8 doesn't support GCC 6.
stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
}; };
ecm = callPackage ../applications/science/math/ecm { }; ecm = callPackage ../applications/science/math/ecm { };