From 10bb3be659f65c84b5639e83a94f3415927850bc Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 8 Sep 2023 03:58:23 +0000 Subject: [PATCH] cudaPackages.cudnn: use libcublas split outputs --- .../libraries/science/math/cudnn/generic.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index db85bfdd9c0b..b1e03e35df12 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -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