python3Packages.pytorch-bin: do not depend on nvidia_x11

libcuda.so should be provided through /run/opengl-driver/lib to use
the system's version. This also avoids rebuilds when linuxPackages is
updated.
This commit is contained in:
Daniël de Kok 2021-02-15 19:29:35 +01:00
parent 406c33bb3d
commit ebf348fc9a
2 changed files with 2 additions and 5 deletions

View File

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

View File

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