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

Merge pull request #113223 from danieldk/pytorch-fixes

Browse Source 
python3Packages.pytorch-bin: do not depend on nvidia_x11
This commit is contained in:
Daniël de Kok 2021-02-17 09:05:21 +01:00 committed by GitHub
commit c58a900f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/pytorch/bin.nix
View File

@ -5,7 +5,6 @@
, isPy38
, isPy39
, python
, nvidia_x11
, addOpenGLRunpath
, future
, numpy
@ -52,7 +51,7 @@ in buildPythonPackage {
'';
postFixup = let
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ];
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
in ''
find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
echo "setting rpath for $lib..."

4
pkgs/top-level/python-packages.nix
View File

@ -6505,9 +6505,7 @@ in {
pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; };
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix {
inherit (pkgs.linuxPackages) nvidia_x11;
};
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };