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

Merge pull request #97698 from obsidiansystems/pytorch-use-passhthru

Browse Source 
pytorch: update to use passthru's for checks
This commit is contained in:
Benjamin Hipple 2020-09-12 09:46:51 -04:00 committed by GitHub
commit 931c4f2f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/science/math/magma/default.nix
View File

@ -50,4 +50,6 @@ in stdenv.mkDerivation {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ tbenst ]; maintainers = with maintainers; [ tbenst ];
}; };
passthru.cudatoolkit = cudatoolkit;
} }

10
pkgs/development/python-modules/pytorch/default.nix
View File

@ -25,15 +25,11 @@ assert !openMPISupport || openmpi != null;
assert !cudaSupport || cudatoolkit != null; assert !cudaSupport || cudatoolkit != null;
assert cudnn == null || cudatoolkit != null; assert cudnn == null || cudatoolkit != null;
assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version;
in majorIs == "9" || majorIs == "10"); in majorIs == "9" || majorIs == "10" || majorIs == "11");
let
hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs;
matchesCudatoolkit = hasDependency cudatoolkit;
in
# confirm that cudatoolkits are sync'd across dependencies # confirm that cudatoolkits are sync'd across dependencies
assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; assert !(openMPISupport && cudaSupport) || openmpi.cudatoolkit == cudatoolkit;
assert !cudaSupport || matchesCudatoolkit magma; assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
let let
cudatoolkit_joined = symlinkJoin { cudatoolkit_joined = symlinkJoin {