mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 15:33:13 +00:00
Merge pull request #253951 from ConnorBaker/fix/cudaPackages-cudnn-use-libcublas-split-output
cudaPackages.cudnn: use libcublas split outputs
This commit is contained in:
commit
51c4092004
@ -31,12 +31,6 @@ assert useCudatoolkitRunfile || (libcublas != null); let
|
||||
# versionTriple :: String
|
||||
# Version with three components: major.minor.patch
|
||||
versionTriple = majorMinorPatch version;
|
||||
|
||||
# cudatoolkit_root :: Derivation
|
||||
cudatoolkit_root =
|
||||
if useCudatoolkitRunfile
|
||||
then cudatoolkit
|
||||
else libcublas;
|
||||
in
|
||||
backendStdenv.mkDerivation {
|
||||
pname = "cudatoolkit-${cudaMajorVersion}-cudnn";
|
||||
@ -65,7 +59,10 @@ in
|
||||
stdenv.cc.cc.lib
|
||||
|
||||
zlib
|
||||
cudatoolkit_root
|
||||
] ++ lists.optionals useCudatoolkitRunfile [
|
||||
cudatoolkit
|
||||
] ++ lists.optionals (!useCudatoolkitRunfile) [
|
||||
libcublas.lib
|
||||
];
|
||||
|
||||
# We used to patch Runpath here, but now we use autoPatchelfHook
|
||||
|
Loading…
Reference in New Issue
Block a user