git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #137553 from dguibert/dg/cudatoolkit

update cudatoolkit (11.3/11.4), cuddn and cutensor

commit5d043aa51793f98721ab422bf80071f4facdcf34 authorRyan Burns <52847440+r-burns@users.noreply.github.com> dateSat 6 Nov 2021, 17:17 (5 years ago) parentb405a8b2923a0f
5 files changed+36−12
compare with master
unifiedsplit
pkgs/development/compilers/cudatoolkit/common.nix+3−3 pkgs/development/compilers/cudatoolkit/default.nix+11−4 pkgs/development/libraries/science/math/cudnn/default.nix+12−2 pkgs/development/libraries/science/math/cutensor/default.nix+5−1 pkgs/top-level/all-packages.nix+5−2
pkgs/development/compilers/cudatoolkit/common.nix+3−3
@@ -100,14 +100,14 @@ stdenv.mkDerivation rec {
100100 mv * $out/
101101 ''}
102102 ${lib.optionalString (lib.versionAtLeast version "11") ''
103− mkdir -p $out/bin $out/lib64 $out/include $out/doc
103+ mkdir -p $out/bin $out/lib64 $out/include $doc
104104 for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do
105105 if [ -d $dir/bin ]; then
106106 mv $dir/bin/* $out/bin
107107 fi
108108 if [ -d $dir/doc ]; then
109− (cd $dir/doc && find . -type d -exec mkdir -p $out/doc/\{} \;)
110− (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $out/doc/\{} \;)
109+ (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;)
110+ (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;)
111111 fi
112112 if [ -L $dir/include ] || [ -d $dir/include ]; then
113113 (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;)
pkgs/development/compilers/cudatoolkit/default.nix+11−4
@@ -66,11 +66,18 @@ rec {
6666 };
6767
6868 cudatoolkit_11_4 = common {
69− version = "11.4.1";
70− url = "https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run";
71− sha256 = "0180pb1zfajb9l6blr467xkx01yp3snfwm2xix8x52crf6d36v6x";
69+ version = "11.4.2";
70+ url = "https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run";
71+ sha256 = "sha256-u9h8oOkT+DdFSnljZ0c1E83e9VUILk2G7Zo4ZZzIHwo=";
7272 gcc = gcc10; # can bump to 11 along with stdenv.cc
7373 };
7474
75− cudatoolkit_11 = cudatoolkit_11_2;
75+ cudatoolkit_11_5 = common {
76+ version = "11.5.0";
77+ url = "https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run";
78+ sha256 = "sha256-rgoWk9lJfPPYHmlIlD43lGNpANtxyY1Y7v2sr38aHkw=";
79+ gcc = gcc10; # can bump to 11 along with stdenv.cc
80+ };
81+
82+ cudatoolkit_11 = cudatoolkit_11_4;
7683}
pkgs/development/libraries/science/math/cudnn/default.nix+12−2
@@ -1,4 +1,6 @@
1−{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
1+{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
2+, cudatoolkit_11_3, cudatoolkit_11_4
3+}:
24
35let
46 generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -46,5 +48,13 @@ in rec {
4648 cudatoolkit = cudatoolkit_11_2;
4749 };
4850
49− cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2;
51+ cudnn_cudatoolkit_11_3 = cudnn_cudatoolkit_11_0.override {
52+ cudatoolkit = cudatoolkit_11_3;
53+ };
54+
55+ cudnn_cudatoolkit_11_4 = cudnn_cudatoolkit_11_0.override {
56+ cudatoolkit = cudatoolkit_11_4;
57+ };
58+
59+ cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_4;
5060}
pkgs/development/libraries/science/math/cutensor/default.nix+5−1
@@ -14,8 +14,12 @@ rec {
1414 };
1515
1616 cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override {
17+ version = "1.3.1.3";
1718 libPath = "lib/10.2";
1819 cudatoolkit = cudatoolkit_10_2;
20+ # 1.3.1 is compatible with CUDA 11.0, 11.1, and 11.2:
21+ # ephemeral doc at https://developer.nvidia.com/cutensor/downloads
22+ sha256 = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8=";
1923 };
2024
2125 cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2;
@@ -41,5 +45,5 @@ rec {
4145 cudatoolkit = cudatoolkit_11_4;
4246 };
4347
44− cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
48+ cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_4;
4549}
pkgs/top-level/all-packages.nix+5−2
@@ -4282,7 +4282,8 @@ with pkgs;
42824282 cudatoolkit_11_1
42834283 cudatoolkit_11_2
42844284 cudatoolkit_11_3
4285− cudatoolkit_11_4;
4285+ cudatoolkit_11_4
4286+ cudatoolkit_11_5;
42864287
42874288 cudatoolkit = cudatoolkit_10;
42884289
@@ -4295,7 +4296,9 @@ with pkgs;
42954296 cudnn_cudatoolkit_11
42964297 cudnn_cudatoolkit_11_0
42974298 cudnn_cudatoolkit_11_1
4298− cudnn_cudatoolkit_11_2;
4299+ cudnn_cudatoolkit_11_2
4300+ cudnn_cudatoolkit_11_3
4301+ cudnn_cudatoolkit_11_4;
42994302
43004303 cudnn = cudnn_cudatoolkit_10;
43014304