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

Merge pull request #26213 from jyp/tf-standard-gcc 

pythonPackages.tensorflow: Don't change the rpath to point to gcc4.9
This commit is contained in:
Frederik Rietdijk 2017-05-30 11:12:32 +02:00 committed by GitHub
parent 61ce84904e 1fdf42d461
commit 84a13a8bdd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/tensorflow/default.nix
View File

@ -5,7 +5,6 @@
, cudaSupport ? false , cudaSupport ? false
, cudatoolkit ? null , cudatoolkit ? null
, cudnn ? null , cudnn ? null
, gcc49 ? null
, linuxPackages ? null , linuxPackages ? null
, numpy , numpy
, six , six
@ -13,13 +12,11 @@
, swig , swig
, werkzeug , werkzeug
, mock , mock
, gcc
, zlib , zlib
}: }:
assert cudaSupport -> cudatoolkit != null assert cudaSupport -> cudatoolkit != null
&& cudnn != null && cudnn != null
&& gcc49 != null
&& linuxPackages != null; && linuxPackages != null;
# unsupported combination # unsupported combination
@ -98,7 +95,7 @@ buildPythonPackage rec {
propagatedBuildInputs = with stdenv.lib; propagatedBuildInputs = with stdenv.lib;
[ numpy six protobuf3_2 swig werkzeug mock ] [ numpy six protobuf3_2 swig werkzeug mock ]
++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ]; ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
# Note that we need to run *after* the fixup phase because the # Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then # libraries are loaded at runtime. If we run in preFixup then
@ -106,10 +103,10 @@ buildPythonPackage rec {
postFixup = let postFixup = let
rpath = stdenv.lib.makeLibraryPath rpath = stdenv.lib.makeLibraryPath
(if cudaSupport then (if cudaSupport then
[ gcc49.cc.lib zlib cudatoolkit cudnn [ stdenv.cc.cc.lib zlib cudatoolkit cudnn
linuxPackages.nvidia_x11 ] linuxPackages.nvidia_x11 ]
else else
[ gcc.cc.lib zlib ] [ stdenv.cc.cc.lib zlib ]
); );
in in
'' ''