lol

Merge pull request #112648 from danieldk/cuda-update

cudatoolkit_11, cudnn_cudatoolkit_11: 11.1 -> 11.2

authored by

Bernardo Meurer and committed by
GitHub
aaf0a68d 4bca02db

+29 -8
+8 -1
pkgs/development/compilers/cudatoolkit/default.nix
··· 153 153 gcc = gcc9; 154 154 }; 155 155 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; 157 164 }
+15 -5
pkgs/development/libraries/science/math/cudnn/default.nix
··· 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 }: 2 2 3 3 let 4 4 generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { ··· 82 82 cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; 83 83 84 84 cudnn_cudatoolkit_11_0 = generic rec { 85 - version = "8.0.2"; 85 + version = "8.1.0"; 86 86 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="; 89 91 }; 90 92 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; 92 102 }
+6 -2
pkgs/top-level/all-packages.nix
··· 3408 3408 cudatoolkit_10_1 3409 3409 cudatoolkit_10_2 3410 3410 cudatoolkit_11 3411 - cudatoolkit_11_0; 3411 + cudatoolkit_11_0 3412 + cudatoolkit_11_1 3413 + cudatoolkit_11_2; 3412 3414 3413 3415 cudatoolkit = cudatoolkit_10; 3414 3416 ··· 3427 3429 cudnn_cudatoolkit_10_1 3428 3430 cudnn_cudatoolkit_10_2 3429 3431 cudnn_cudatoolkit_11 3430 - cudnn_cudatoolkit_11_0; 3432 + cudnn_cudatoolkit_11_0 3433 + cudnn_cudatoolkit_11_1 3434 + cudnn_cudatoolkit_11_2; 3431 3435 3432 3436 cudnn = cudnn_cudatoolkit_10; 3433 3437