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

treewise: respect config.cudaSupport in packages

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-09-17 07:08:07 +03:00
parent 6309e5fa01
commit 85d3c00dce
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10013,6 +10013,7 @@ with pkgs;
}; };
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { opencv3 = callPackage ../development/libraries/opencv/3.x.nix {
enableCuda = config.cudaSupport or false;
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit;
}; };
@ -10076,6 +10077,7 @@ with pkgs;
opensubdiv = callPackage ../development/libraries/opensubdiv { opensubdiv = callPackage ../development/libraries/opensubdiv {
stdenv_gcc5 = overrideCC stdenv gcc5; stdenv_gcc5 = overrideCC stdenv gcc5;
cudaSupport = config.cudaSupport or false;
cmake = cmake_2_8; cmake = cmake_2_8;
}; };
@ -13813,6 +13815,7 @@ with pkgs;
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
stdenv_gcc5 = overrideCC stdenv gcc5; stdenv_gcc5 = overrideCC stdenv gcc5;
cudaSupport = config.cudaSupport or false;
python = python35; python = python35;
}; };
@ -18730,8 +18733,7 @@ with pkgs;
caffe = callPackage ../applications/science/math/caffe rec { caffe = callPackage ../applications/science/math/caffe rec {
cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false;
# CUDA 8 doesn't support GCC 6. cudnnSupport = cudaSupport;
stdenv = if cudaSupport then overrideCC pkgs.stdenv gcc5 else pkgs.stdenv;
}; };
ecm = callPackage ../applications/science/math/ecm { }; ecm = callPackage ../applications/science/math/ecm { };
@ -18755,7 +18757,9 @@ with pkgs;
sbcl = null; sbcl = null;
}; };
mxnet = callPackage ../applications/science/math/mxnet { mxnet = callPackage ../applications/science/math/mxnet rec {
cudaSupport = config.cudaSupport or false;
cudnnSupport = cudaSupport;
inherit (linuxPackages) nvidia_x11; inherit (linuxPackages) nvidia_x11;
}; };

12
pkgs/top-level/python-packages.nix
View File

@ -25980,14 +25980,16 @@ EOF
tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { };
tensorflow = self.tensorflowWithoutCuda; tensorflow = callPackage ../development/python-modules/tensorflow {
cudaSupport = pkgs.config.cudaSupport or false;
};
tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; tensorflowWithoutCuda = self.tensorflow.override {
cudaSupport = false;
};
tensorflowWithCuda = callPackage ../development/python-modules/tensorflow { tensorflowWithCuda = self.tensorflow.override {
cudaSupport = true; cudaSupport = true;
cudatoolkit = pkgs.cudatoolkit8;
cudnn = pkgs.cudnn60_cudatoolkit80;
}; };
tflearn = buildPythonPackage rec { tflearn = buildPythonPackage rec {