alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cntk: move defaults to package file

Browse source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:32:16 +00:00
parent 31aa884b7f
commit 4bc66b1994
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/science/math/cntk/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake
, openblas, opencv3, libzip, boost, protobuf, openmpi
, onebitSGDSupport ? false
, cudaSupport ? false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn
, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport, cudnn
}:
assert cudnnSupport -> cudaSupport;

7
pkgs/top-level/all-packages.nix
View file

@ -21862,12 +21862,9 @@ in
opencv3 = opencv3WithoutCuda; # Used only for image loading.
});
cntk = callPackage ../applications/science/math/cntk rec {
cudaSupport = pkgs.config.cudaSupport or false;
cudnnSupport = cudaSupport;
cntk = callPackage ../applications/science/math/cntk {
inherit (linuxPackages) nvidia_x11;
# Used only for image loading.
opencv3 = opencv3WithoutCuda;
opencv3 = opencv3WithoutCuda; # Used only for image loading.
};
ecm = callPackage ../applications/science/math/ecm { };