diff options
| author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2017-02-27 15:23:23 +0100 |
|---|---|---|
| committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2017-02-27 15:23:23 +0100 |
| commit | f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf (patch) | |
| tree | 1e76e4c7ba3cbc3dd8ff67853776286ba94c5987 /pkgs/development/python-modules/tensorflow | |
| parent | 7864782d71b3653b7c50da492f5548b3cf3dc0ca (diff) | |
| download | nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar.gz nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar.bz2 nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar.lz nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar.xz nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.tar.zst nixlib-f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf.zip | |
tensorflow: depend on cudatoolkit 8 and cudnn 5.1
Diffstat (limited to 'pkgs/development/python-modules/tensorflow')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 9357ea90b405..04e820307a48 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -3,8 +3,8 @@ , buildPythonPackage , isPy35, isPy27 , cudaSupport ? false -, cudatoolkit75 ? null -, cudnn5_cudatoolkit75 ? null +, cudatoolkit ? null +, cudnn ? null , gcc49 ? null , linuxPackages ? null , numpy @@ -16,8 +16,8 @@ , zlib }: -assert cudaSupport -> cudatoolkit75 != null - && cudnn5_cudatoolkit75 != null +assert cudaSupport -> cudatoolkit != null + && cudnn != null && gcc49 != null && linuxPackages != null; @@ -97,7 +97,7 @@ buildPythonPackage rec { propagatedBuildInputs = with stdenv.lib; [ numpy six protobuf3_2 swig mock ] - ++ optionals cudaSupport [ cudatoolkit75 cudnn5_cudatoolkit75 gcc49 ]; + ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ]; # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then @@ -105,7 +105,7 @@ buildPythonPackage rec { postFixup = let rpath = stdenv.lib.makeLibraryPath (if cudaSupport then - [ gcc49.cc.lib zlib cudatoolkit75 cudnn5_cudatoolkit75 + [ gcc49.cc.lib zlib cudatoolkit cudnn linuxPackages.nvidia_x11 ] else [ gcc.cc.lib zlib ] |