mxnet: move defaults to package file

This commit is contained in:
Jan Malakhovski 2019-02-03 15:32:14 +00:00
parent 11b6496557
commit 49148a3ea2
2 changed files with 4 additions and 6 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, bash, cmake { config, stdenv, lib, fetchurl, bash, cmake
, opencv, gtest, openblas, liblapack, perl , opencv, gtest, openblas, liblapack, perl
, cudaSupport ? false, cudatoolkit, nvidia_x11 , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn , cudnnSupport ? cudaSupport, cudnn
}: }:
assert cudnnSupport -> cudaSupport; assert cudnnSupport -> cudaSupport;

View File

@ -21902,9 +21902,7 @@ in
sbcl = null; sbcl = null;
}; };
mxnet = callPackage ../applications/science/math/mxnet rec { mxnet = callPackage ../applications/science/math/mxnet {
cudaSupport = config.cudaSupport or false;
cudnnSupport = cudaSupport;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
}; };