git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112648 from danieldk/cuda-update

cudatoolkit_11, cudnn_cudatoolkit_11: 11.1 -> 11.2

commitaaf0a68d814c49edbe9412fa81d9d7ab2edb6498 authorBernardo Meurer <bernardo@meurer.org> dateSun 14 Feb 2021, 05:44 (6 years ago) parent4bca02df1db117
3 files changed+29−8
pkgs/development/compilers/cudatoolkit/default.nix+8−1 pkgs/development/libraries/science/math/cudnn/default.nix+15−5 pkgs/top-level/all-packages.nix+6−2
pkgs/development/compilers/cudatoolkit/default.nix+8−1
@@ -153,5 +153,12 @@ in rec {
153153 gcc = gcc9;
154154 };
155155
156− cudatoolkit_11 = cudatoolkit_11_1;
156+ cudatoolkit_11_2 = common {
157+ version = "11.2.1";
158+ url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run";
159+ sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g=";
160+ gcc = gcc9;
161+ };
162+
163+ cudatoolkit_11 = cudatoolkit_11_2;
157164}
pkgs/development/libraries/science/math/cudnn/default.nix+15−5
@@ -1,4 +1,4 @@
1−{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }:
1+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }:
22
33let
44 generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -82,11 +82,21 @@ in rec {
8282 cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2;
8383
8484 cudnn_cudatoolkit_11_0 = generic rec {
85− version = "8.0.2";
85+ version = "8.1.0";
8686 cudatoolkit = cudatoolkit_11_0;
87− srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz";
88− sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7";
87+ # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2:
88+ # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions
89+ srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz";
90+ sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss=";
8991 };
9092
91− cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0;
93+ cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override {
94+ cudatoolkit = cudatoolkit_11_1;
95+ };
96+
97+ cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override {
98+ cudatoolkit = cudatoolkit_11_2;
99+ };
100+
101+ cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2;
92102}
pkgs/top-level/all-packages.nix+6−2
@@ -3408,7 +3408,9 @@ in
34083408 cudatoolkit_10_1
34093409 cudatoolkit_10_2
34103410 cudatoolkit_11
3411− cudatoolkit_11_0;
3411+ cudatoolkit_11_0
3412+ cudatoolkit_11_1
3413+ cudatoolkit_11_2;
34123414
34133415 cudatoolkit = cudatoolkit_10;
34143416
@@ -3427,7 +3429,9 @@ in
34273429 cudnn_cudatoolkit_10_1
34283430 cudnn_cudatoolkit_10_2
34293431 cudnn_cudatoolkit_11
3430− cudnn_cudatoolkit_11_0;
3432+ cudnn_cudatoolkit_11_0
3433+ cudnn_cudatoolkit_11_1
3434+ cudnn_cudatoolkit_11_2;
34313435
34323436 cudnn = cudnn_cudatoolkit_10;
34333437