From 659354f0b75929c84ab53c57787e26fbb8d6e506 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 08:38:15 +0200 Subject: [PATCH 1/8] cudnn_cudatoolkit: init 11_3 and 11_4 --- .../libraries/science/math/cudnn/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d2a5a8c2a790..0e303272c748 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,6 @@ -{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: +{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_3, cudatoolkit_11_4 +}: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -46,5 +48,13 @@ in rec { cudatoolkit = cudatoolkit_11_2; }; + cudnn_cudatoolkit_11_3 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_3; + }; + + cudnn_cudatoolkit_11_4 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_4; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9933bfc4af47..0d05a3ff6613 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4154,7 +4154,9 @@ with pkgs; cudnn_cudatoolkit_11 cudnn_cudatoolkit_11_0 cudnn_cudatoolkit_11_1 - cudnn_cudatoolkit_11_2; + cudnn_cudatoolkit_11_2 + cudnn_cudatoolkit_11_3 + cudnn_cudatoolkit_11_4; cudnn = cudnn_cudatoolkit_10; From e6da69e878f956fa179169024c1458708635f1d9 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 09:10:17 +0200 Subject: [PATCH 2/8] cudatolkit: fix documentation into $doc output --- pkgs/development/compilers/cudatoolkit/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 585277064ab1..f408d7b33121 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -100,14 +100,14 @@ stdenv.mkDerivation rec { mv * $out/ ''} ${lib.optionalString (lib.versionAtLeast version "11") '' - mkdir -p $out/bin $out/lib64 $out/include $out/doc + mkdir -p $out/bin $out/lib64 $out/include $doc for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do if [ -d $dir/bin ]; then mv $dir/bin/* $out/bin fi if [ -d $dir/doc ]; then - (cd $dir/doc && find . -type d -exec mkdir -p $out/doc/\{} \;) - (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $out/doc/\{} \;) + (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;) + (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;) fi if [ -L $dir/include ] || [ -d $dir/include ]; then (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) From 9650d42a4c3e12e0df3a0b8e9c0209b8ceb438f5 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 09:12:46 +0200 Subject: [PATCH 3/8] cutensor: 1.2.2.5 -> 1.3.1.3 --- pkgs/development/libraries/science/math/cutensor/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix index b8f4475ce122..17fce6fb6550 100644 --- a/pkgs/development/libraries/science/math/cutensor/default.nix +++ b/pkgs/development/libraries/science/math/cutensor/default.nix @@ -14,8 +14,12 @@ rec { }; cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override { + version = "1.3.1.3"; libPath = "lib/10.2"; cudatoolkit = cudatoolkit_10_2; + # 1.3.1 is compatible with CUDA 11.0, 11.1, and 11.2: + # ephemeral doc at https://developer.nvidia.com/cutensor/downloads + sha256 = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; }; cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2; From 7f98fe1ebdd7f551fe698ec704c648d7aec8a2a7 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 09:25:46 +0200 Subject: [PATCH 4/8] cudatoolkit: make 11_4 as default 11 --- pkgs/development/compilers/cudatoolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 1747f16f12d1..ff2678b2f095 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -72,5 +72,5 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; - cudatoolkit_11 = cudatoolkit_11_2; + cudatoolkit_11 = cudatoolkit_11_4; } From 20d65c583861362bc630123c49da42efe109ed78 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 09:26:11 +0200 Subject: [PATCH 5/8] cudnn: make 11_4 as default 11 --- pkgs/development/libraries/science/math/cudnn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 0e303272c748..3d4d4c21e5a1 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -56,5 +56,5 @@ in rec { cudatoolkit = cudatoolkit_11_4; }; - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_4; } From a6448ad36e050066daae5897a66598a1ade2299a Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 17 Aug 2021 09:26:47 +0200 Subject: [PATCH 6/8] cutensor: make 11_4 as default 11 --- pkgs/development/libraries/science/math/cutensor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix index 17fce6fb6550..25633ca63e6b 100644 --- a/pkgs/development/libraries/science/math/cutensor/default.nix +++ b/pkgs/development/libraries/science/math/cutensor/default.nix @@ -45,5 +45,5 @@ rec { cudatoolkit = cudatoolkit_11_4; }; - cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2; + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_4; } From 8316ec9e4ed3743517f6ddb6323b1a5588f9cdb5 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 21 Oct 2021 11:03:02 +0200 Subject: [PATCH 7/8] cudatoolkit: add 11.5.0 --- pkgs/development/compilers/cudatoolkit/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index ff2678b2f095..2feafad8cd06 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -72,5 +72,12 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; + cudatoolkit_11_5 = common { + version = "11.5.0"; + url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run"; + sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw="; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_4; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d05a3ff6613..f3c7ffb75372 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4141,7 +4141,8 @@ with pkgs; cudatoolkit_11_1 cudatoolkit_11_2 cudatoolkit_11_3 - cudatoolkit_11_4; + cudatoolkit_11_4 + cudatoolkit_11_5; cudatoolkit = cudatoolkit_10; From 2923a0fbab77b7bbb25de96bfe5b332595305d08 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 21 Oct 2021 11:24:27 +0200 Subject: [PATCH 8/8] cudatoolkit: 11.4.1 -> 11.4.2 --- pkgs/development/compilers/cudatoolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 2feafad8cd06..33a386cfb926 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -66,9 +66,9 @@ rec { }; cudatoolkit_11_4 = common { - version = "11.4.1"; - url = "https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run"; - sha256 = "0180pb1zfajb9l6blr467xkx01yp3snfwm2xix8x52crf6d36v6x"; + version = "11.4.2"; + url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run"; + sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo="; gcc = gcc10; # can bump to 11 along with stdenv.cc };