Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 61ce84904e72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 84a13a8bddf0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 30, 2017

  1. pythonPackages.tensorflow: Don't change the rpath to point to gcc4.9 

    When using cuda, the rpath was set to include GCC lib version 4.9.
I am not sure what this was attempting to do, but an effect was to
prevent certain python libraries to find the correct (newer) version
of the std lib.

Also avoid mentions of any specifc version in the
propagatedBuildInputs
    @jyp
    jyp committed May 30, 2017
    Copy the full SHA
    1fdf42d View commit details

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

    pythonPackages.tensorflow: Don't change the rpath to point to gcc4.9
    @FRidh
    FRidh authored May 30, 2017
    Copy the full SHA
    84a13a8 View commit details
Showing with 3 additions and 6 deletions.
  1. +3 −6 pkgs/development/python-modules/tensorflow/default.nix
9 changes: 3 additions & 6 deletions pkgs/development/python-modules/tensorflow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,21 +5,18 @@
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
, gcc49 ? null
, linuxPackages ? null
, numpy
, six
, protobuf3_2
, swig
, werkzeug
, mock
, gcc
, zlib
}:

assert cudaSupport -> cudatoolkit != null
&& cudnn != null
&& gcc49 != null
&& linuxPackages != null;

# unsupported combination
@@ -98,18 +95,18 @@ buildPythonPackage rec {

propagatedBuildInputs = with stdenv.lib;
[ 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
# libraries are loaded at runtime. If we run in preFixup then
# patchelf --shrink-rpath will remove the cuda libraries.
postFixup = let
rpath = stdenv.lib.makeLibraryPath
(if cudaSupport then
[ gcc49.cc.lib zlib cudatoolkit cudnn
[ stdenv.cc.cc.lib zlib cudatoolkit cudnn
linuxPackages.nvidia_x11 ]
else
[ gcc.cc.lib zlib ]
[ stdenv.cc.cc.lib zlib ]
);
in
''