forked from mirrors/nixpkgs
pythonPackages.pytorch: 1.4.1 -> 1.5.0
Fixes previous bugs that required a patch Fixes CUDA build, see https://github.com/NixOS/nixpkgs/issues/89403
This commit is contained in:
parent
3ee1dcce2c
commit
0574ace715
|
@ -104,7 +104,7 @@ let
|
|||
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
pname = "pytorch";
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
@ -118,7 +118,7 @@ in buildPythonPackage rec {
|
|||
repo = "pytorch";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms";
|
||||
sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString cudaSupport ''
|
||||
|
@ -128,24 +128,6 @@ in buildPythonPackage rec {
|
|||
export CUDNN_INCLUDE_DIR=${cudnn}/include
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Prevents a race condition which would be introduced by pull 30333.
|
||||
# See https://github.com/pytorch/pytorch/issues/32277
|
||||
# Can be removed >1.5.0.
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch";
|
||||
sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2";
|
||||
})
|
||||
|
||||
# Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang.
|
||||
# See https://github.com/pytorch/pytorch/issues/32277
|
||||
# Can be removed >1.5.0.
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch";
|
||||
sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q";
|
||||
})
|
||||
];
|
||||
|
||||
# Use pytorch's custom configurations
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
|
Loading…
Reference in a new issue