From 8e7955e5bf11815b56c6975fe990fcb3a6a4dd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:20:34 +0100 Subject: [PATCH 1/7] cudatoolkit_11_2: init at 11.2.1 --- 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 b3b7b305fba..5d33ea78580 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -153,5 +153,12 @@ in rec { gcc = gcc9; }; + cudatoolkit_11_2 = common { + version = "11.2.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"; + sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="; + gcc = gcc9; + }; + cudatoolkit_11 = cudatoolkit_11_1; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0952fbe113..050a4fcb727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3401,7 +3401,8 @@ in cudatoolkit_10_1 cudatoolkit_10_2 cudatoolkit_11 - cudatoolkit_11_0; + cudatoolkit_11_0 + cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; From 23fecf0d5a1317ad9b1902674d4b2e79e92be080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:22:14 +0100 Subject: [PATCH 2/7] cudatoolkit_11_1: add missing top-level attribute --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 050a4fcb727..9ae0f6906f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3402,6 +3402,7 @@ in cudatoolkit_10_2 cudatoolkit_11 cudatoolkit_11_0 + cudatoolkit_11_1 cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; From 63cdb44b488f735eb330a428f03e772f00f9144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:22:47 +0100 Subject: [PATCH 3/7] cudnn_cudatoolkit_11_0: 8.0.2 -> 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d99149c0e96..7de35092d50 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -82,10 +82,12 @@ in rec { cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { - version = "8.0.2"; + version = "8.1.0"; cudatoolkit = cudatoolkit_11_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; - sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: + # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; + sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; }; cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; From 961f53124236a4233fca78c45c03b47bb6156fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:25:50 +0100 Subject: [PATCH 4/7] cudnn_cudatoolkit_11_1: init at 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 7de35092d50..6efdc8c9361 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -90,5 +90,9 @@ in rec { sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; }; + cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ae0f6906f6..5b62f7da7f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3422,7 +3422,8 @@ in cudnn_cudatoolkit_10_1 cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11_0 + cudnn_cudatoolkit_11_1; cudnn = cudnn_cudatoolkit_10; From cbbacce70a7ae3a241c34238d68bff46004fa722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:27:55 +0100 Subject: [PATCH 5/7] cudnn_cudatoolkit_11_2: init at 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 6efdc8c9361..265c05541e9 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ 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 }: +{ 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 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -94,5 +94,9 @@ in rec { cudatoolkit = cudatoolkit_11_1; }; + cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b62f7da7f8..0f512cf16be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3423,7 +3423,8 @@ in cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 cudnn_cudatoolkit_11_0 - cudnn_cudatoolkit_11_1; + cudnn_cudatoolkit_11_1 + cudnn_cudatoolkit_11_2; cudnn = cudnn_cudatoolkit_10; From 18b5919d81244770178aea90cd6b6cd06afbba7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:28:53 +0100 Subject: [PATCH 6/7] cudatoolkit_11: cudatoolkit_11_1 -> cudatoolkit_11_2 --- 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 5d33ea78580..3c08e9030ff 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -160,5 +160,5 @@ in rec { gcc = gcc9; }; - cudatoolkit_11 = cudatoolkit_11_1; + cudatoolkit_11 = cudatoolkit_11_2; } From f1db117b9f6af75fb5302bc99bbe14087024b6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:29:38 +0100 Subject: [PATCH 7/7] cudnn_cudatoolkit_11: cudnn_cudatoolkit_11_0 -> cudnn_cudatoolkit_11_2 --- 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 265c05541e9..c9bf9a49e68 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -98,5 +98,5 @@ in rec { cudatoolkit = cudatoolkit_11_2; }; - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; }