mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 22:32:58 +03:00
caffe: move defaults to package file
This commit is contained in:
parent
49148a3ea2
commit
31aa884b7f
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, runCommand
|
||||
{ config, stdenv, lib, runCommand
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, cmake
|
||||
@ -13,8 +13,8 @@
|
||||
, Accelerate, CoreGraphics, CoreVideo
|
||||
, lmdbSupport ? true, lmdb
|
||||
, leveldbSupport ? true, leveldb, snappy
|
||||
, cudaSupport ? stdenv.isLinux, cudatoolkit
|
||||
, cudnnSupport ? false, cudnn ? null
|
||||
, cudaSupport ? config.cudaSupport or false, cudatoolkit
|
||||
, cudnnSupport ? cudaSupport, cudnn ? null
|
||||
, ncclSupport ? false, nccl ? null
|
||||
, pythonSupport ? false, python ? null, numpy ? null
|
||||
}:
|
||||
|
@ -21850,20 +21850,16 @@ in
|
||||
|
||||
### SCIENCE / MATH
|
||||
|
||||
caffe = callPackage ../applications/science/math/caffe rec {
|
||||
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false;
|
||||
cudnnSupport = cudaSupport;
|
||||
# Used only for image loading.
|
||||
opencv3 = opencv3WithoutCuda;
|
||||
caffe = callPackage ../applications/science/math/caffe ({
|
||||
opencv3 = opencv3WithoutCuda; # Used only for image loading.
|
||||
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
|
||||
};
|
||||
} // (config.caffe or {}));
|
||||
|
||||
caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
|
||||
inherit (python36Packages) python future six numpy pydot;
|
||||
protobuf = protobuf3_1;
|
||||
python-protobuf = python36Packages.protobuf.override { inherit protobuf; };
|
||||
# Used only for image loading.
|
||||
opencv3 = opencv3WithoutCuda;
|
||||
opencv3 = opencv3WithoutCuda; # Used only for image loading.
|
||||
});
|
||||
|
||||
cntk = callPackage ../applications/science/math/cntk rec {
|
||||
|
Loading…
Reference in New Issue
Block a user