From 504676a454d06bdd60003f4f7c009ae14a43e829 Mon Sep 17 00:00:00 2001 From: ogoid <1449961+ogoid@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:21:21 +0000 Subject: [PATCH 1/4] cudaPackages.cudnn: fix missing libcublas paths adds missing paths to libculas, fixes #236070 --- pkgs/development/libraries/science/math/cudnn/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index cdfa924b2242..42006e2f8d37 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,6 +94,8 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so.11 + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublasLt.so.11 ''; passthru = { From c519ceaa21fd2fb14557a7543e4884cd6ead8b94 Mon Sep 17 00:00:00 2001 From: ogoid <1449961+ogoid@users.noreply.github.com> Date: Wed, 19 Jul 2023 19:22:49 +0000 Subject: [PATCH 2/4] patch all cudnn libraries to require libcublas more libcudnn_*.so libraries may require libcublas.so --- pkgs/development/libraries/science/math/cudnn/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 42006e2f8d37..99df51a59b20 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,8 +94,8 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so.11 - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublasLt.so.11 + patchelf $out/lib/*.so --add-needed libcublas.so.11 + patchelf $out/lib/*.so --add-needed libcublasLt.so.11 ''; passthru = { From e1c91b230122dceca76e600aae5a97d2f590ebb2 Mon Sep 17 00:00:00 2001 From: ogoid <1449961+ogoid@users.noreply.github.com> Date: Thu, 20 Jul 2023 00:57:10 +0000 Subject: [PATCH 3/4] improve cudnn fix Co-authored-by: Samuel Ainsworth --- pkgs/development/libraries/science/math/cudnn/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 99df51a59b20..dc9690cfc14e 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,8 +94,7 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/*.so --add-needed libcublas.so.11 - patchelf $out/lib/*.so --add-needed libcublasLt.so.11 + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so.11 --add-needed libcublasLt.so.11 ''; passthru = { From 9325a80a11ed2bffa693d36e79112072769acdf4 Mon Sep 17 00:00:00 2001 From: ogoid <1449961+ogoid@users.noreply.github.com> Date: Mon, 24 Jul 2023 23:35:54 +0000 Subject: [PATCH 4/4] fix libcudnn also on cuda12 Co-authored-by: Samuel Ainsworth --- pkgs/development/libraries/science/math/cudnn/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index dc9690cfc14e..e0a6ffd9d547 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -94,7 +94,7 @@ in # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so.11 --add-needed libcublasLt.so.11 + patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so ''; passthru = {