cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #139497 from r-burns/tensorflow-nvidia-x11

Browse source 
python3Packages.tensorflow-bin: remove nvidia_x11 reference
This commit is contained in:
Ryan Burns 2021-09-27 19:09:49 -07:00 committed by GitHub
commit 5d8d40c397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/science/math/tensorflow/bin.nix
View file

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

5
pkgs/development/python-modules/tensorflow/bin.nix
View file

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

1
pkgs/top-level/all-packages.nix
View file

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

1
pkgs/top-level/python-packages.nix
View file

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