From 3c815cf0e609e65ac8332dcb6c477792e0e7aff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 14 Feb 2021 11:58:00 +0100 Subject: [PATCH] cudatoolkit-{6,6_5,7,7_5,8}: remove Remove ancient CUDA toolkits (and corresponding CuDNN versions): - Not supported by upstream anymore. - We do not use them in nixpkgs. - We do not test or actively maintain them. - Anything but ancient GPUs is supported by newer toolkits. --- .../compilers/cudatoolkit/default.nix | 41 ------------------- .../libraries/science/math/cudnn/default.nix | 31 +------------- pkgs/top-level/aliases.nix | 9 ++++ pkgs/top-level/all-packages.nix | 9 ---- 4 files changed, 10 insertions(+), 80 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 3c08e9030ffa..5685f1788764 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -10,47 +10,6 @@ let common = callPackage ./common.nix; in rec { - cudatoolkit_6 = common { - version = "6.0.37"; - url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run"; - sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; - gcc = gcc48; - }; - - cudatoolkit_6_5 = common { - version = "6.5.19"; - url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run"; - sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj"; - gcc = gcc48; - }; - - cudatoolkit_7 = common { - version = "7.0.28"; - url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; - sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; - gcc = gcc6; - }; - - cudatoolkit_7_5 = common { - version = "7.5.18"; - url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; - sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; - gcc = gcc6; - }; - - cudatoolkit_8 = common { - version = "8.0.61.2"; - url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run"; - sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w"; - runPatches = [ - (fetchurl { - url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run"; - sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; - }) - ]; - gcc = gcc6; - }; - cudatoolkit_9_0 = common { version = "9.0.176.1"; url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run"; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index c9bf9a49e683..b8aac46d9194 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, cudatoolkit_11_2 }: +{ callPackage, 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"])) { @@ -6,35 +6,6 @@ let }; in rec { - cudnn_cudatoolkit_7 = generic rec { - # Old URL is v4 instead of v4.0 for some reason... - version = "4"; - cudatoolkit = cudatoolkit_7; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz"; - sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd"; - }; - - cudnn_cudatoolkit_7_5 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_7_5; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an"; - }; - - cudnn6_cudatoolkit_8 = generic rec { - version = "6.0"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz"; - sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv"; - }; - - cudnn_cudatoolkit_8 = generic rec { - version = "7.0.5"; - cudatoolkit = cudatoolkit_8; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e"; - }; - cudnn_cudatoolkit_9_0 = generic rec { version = "7.3.0"; cudatoolkit = cudatoolkit_9_0; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e16cde6601ef..5ebbfc98ee9a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -113,6 +113,15 @@ mapAliases ({ cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 + cudatoolkit_6 = throw "cudatoolkit_6 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_65 = throw "cudatoolkit_65 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_7 = throw "cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_7_5 = throw "cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 + cudatoolkit_8 = throw "cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_7 = throw "cudnn_cudatoolkit_7 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_7_5 = throw "cudnn_cudatoolkit_7_5 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn6_cudatoolkit_8 = throw "cudnn6_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 + cudnn_cudatoolkit_8 = throw "cudnn_cudatoolkit_8 has been removed in favor of newer versions"; # added 2021-02-14 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7c37bc9c5eb..e5918ff9a159 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3394,11 +3394,6 @@ in cudaPackages = recurseIntoAttrs (callPackage ../development/compilers/cudatoolkit {}); inherit (cudaPackages) - cudatoolkit_6 - cudatoolkit_6_5 - cudatoolkit_7 - cudatoolkit_7_5 - cudatoolkit_8 cudatoolkit_9 cudatoolkit_9_0 cudatoolkit_9_1 @@ -3416,10 +3411,6 @@ in cudnnPackages = callPackages ../development/libraries/science/math/cudnn { }; inherit (cudnnPackages) - cudnn_cudatoolkit_7 - cudnn_cudatoolkit_7_5 - cudnn6_cudatoolkit_8 - cudnn_cudatoolkit_8 cudnn_cudatoolkit_9 cudnn_cudatoolkit_9_0 cudnn_cudatoolkit_9_1