python3Packages.tensorflow-bin: remove nvidia_x11 reference

the nvidia driver should be picked up from /run/opengl-driver/lib
(and is, since we're already using addOpenGLRunpath)
This commit is contained in:
Ryan Burns 2021-09-25 18:12:51 -07:00
parent 90ce428218
commit 7ba89a2e22
4 changed files with 3 additions and 8 deletions

View File

@ -1,7 +1,7 @@
{ lib, stdenv
, fetchurl
, addOpenGLRunpath
, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn
}:
with lib;
@ -17,7 +17,7 @@ let
platform = "x86_64";
rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]);
packages = import ./binary-hashes.nix;

View File

@ -23,7 +23,6 @@
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
, nvidia_x11 ? null
, zlib
, python
, symlinkJoin
@ -41,8 +40,7 @@
# - the source build is currently brittle and not easy to maintain
assert cudaSupport -> cudatoolkit != null
&& cudnn != null
&& nvidia_x11 != null;
&& cudnn != null;
# unsupported combination
assert ! (stdenv.isDarwin && cudaSupport);
@ -126,7 +124,6 @@ in buildPythonPackage {
cudatoolkit.out
cudatoolkit.lib
cudnn
nvidia_x11
];
libpaths = [

View File

@ -2058,7 +2058,6 @@ with pkgs;
libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
cudaSupport = config.cudaSupport or false;
inherit (linuxPackages) nvidia_x11;
cudatoolkit = cudatoolkit_10_0;
cudnn = cudnn_cudatoolkit_10_0;
};

View File

@ -8831,7 +8831,6 @@ in {
tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit_11_0;
cudnn = pkgs.cudnn_cudatoolkit_11_0;
};