renaming cudatoolkit version numbers

This commit is contained in:
Jean-Philippe Bernardy 2018-05-31 09:12:59 +02:00
parent 1f14408b0e
commit 9e730ee254
5 changed files with 47 additions and 47 deletions

View file

@ -151,35 +151,35 @@ let
in {
cudatoolkit6 = common {
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;
};
cudatoolkit65 = common {
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;
};
cudatoolkit7 = common {
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 = gcc49;
};
cudatoolkit75 = common {
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 = gcc49;
};
cudatoolkit8 = common {
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";
@ -192,7 +192,7 @@ in {
gcc = gcc5;
};
cudatoolkit9 = common {
cudatoolkit_9 = common {
version = "9.1.85.1";
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";

View file

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }:
{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -8,37 +8,37 @@ let
in
{
cudnn_cudatoolkit7 = generic rec {
cudnn_cudatoolkit_7 = generic rec {
version = "4.0";
cudatoolkit = cudatoolkit7;
cudatoolkit = cudatoolkit_7;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
};
cudnn_cudatoolkit75 = generic rec {
cudnn_cudatoolkit_7_5 = generic rec {
version = "6.0";
cudatoolkit = cudatoolkit75;
cudatoolkit = cudatoolkit_7_5;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an";
};
cudnn6_cudatoolkit8 = generic rec {
cudnn6_cudatoolkit_8 = generic rec {
version = "6.0";
cudatoolkit = cudatoolkit8;
cudatoolkit = cudatoolkit_8;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv";
};
cudnn_cudatoolkit8 = generic rec {
cudnn_cudatoolkit_8 = generic rec {
version = "7.0.5";
cudatoolkit = cudatoolkit8;
cudatoolkit = cudatoolkit_8;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e";
};
cudnn_cudatoolkit9 = generic rec {
cudnn_cudatoolkit_9 = generic rec {
version = "7.0.5";
cudatoolkit = cudatoolkit9;
cudatoolkit = cudatoolkit_9;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
};

View file

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit8, cudatoolkit9 }:
{ callPackage, cudatoolkit_8, cudatoolkit_9 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -8,16 +8,16 @@ let
in
{
nccl_cudatoolkit8 = generic rec {
nccl_cudatoolkit_8 = generic rec {
version = "2.1.4";
cudatoolkit = cudatoolkit8;
cudatoolkit = cudatoolkit_8;
srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi";
};
nccl_cudatoolkit9 = generic rec {
nccl_cudatoolkit_9 = generic rec {
version = "2.1.4";
cudatoolkit = cudatoolkit9;
cudatoolkit = cudatoolkit_9;
srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p";
};

View file

@ -1864,23 +1864,23 @@ with pkgs;
cron = callPackage ../tools/system/cron { };
inherit (callPackages ../development/compilers/cudatoolkit { })
cudatoolkit6
cudatoolkit65
cudatoolkit7
cudatoolkit75
cudatoolkit8
cudatoolkit9;
cudatoolkit_6
cudatoolkit_6_5
cudatoolkit_7
cudatoolkit_7_5
cudatoolkit_8
cudatoolkit_9;
cudatoolkit = cudatoolkit9;
cudatoolkit = cudatoolkit_9;
inherit (callPackages ../development/libraries/science/math/cudnn { })
cudnn_cudatoolkit7
cudnn_cudatoolkit75
cudnn6_cudatoolkit8
cudnn_cudatoolkit8
cudnn_cudatoolkit9;
cudnn_cudatoolkit_7
cudnn_cudatoolkit_7_5
cudnn6_cudatoolkit_8
cudnn_cudatoolkit_8
cudnn_cudatoolkit_9;
cudnn = cudnn_cudatoolkit9;
cudnn = cudnn_cudatoolkit_9;
curlFull = curl.override {
idnSupport = true;
@ -3910,10 +3910,10 @@ with pkgs;
xnbd = callPackage ../tools/networking/xnbd { };
inherit (callPackages ../development/libraries/science/math/nccl { })
nccl_cudatoolkit8
nccl_cudatoolkit9;
nccl_cudatoolkit_8
nccl_cudatoolkit_9;
nccl = nccl_cudatoolkit9;
nccl = nccl_cudatoolkit_9;
ndjbdns = callPackage ../tools/networking/ndjbdns { };

View file

@ -1199,8 +1199,8 @@ in {
cufflinks = callPackage ../development/python-modules/cufflinks { };
cupy = callPackage ../development/python-modules/cupy {
cudatoolkit = pkgs.cudatoolkit8;
cudnn = pkgs.cudnn6_cudatoolkit8;
cudatoolkit = pkgs.cudatoolkit_8;
cudnn = pkgs.cudnn6_cudatoolkit_8;
nccl = pkgs.nccl;
};
@ -3968,7 +3968,7 @@ in {
};
pycuda = callPackage ../development/python-modules/pycuda rec {
cudatoolkit = pkgs.cudatoolkit75;
cudatoolkit = pkgs.cudatoolkit_7_5;
inherit (pkgs.stdenv) mkDerivation;
};
@ -5600,14 +5600,14 @@ in {
# https://github.com/pytorch/pytorch/issues/5831
# https://devtalk.nvidia.com/default/topic/1028112
# We should be able to remove this when CUDA 9.2 is released.
cudatoolkit9 = pkgs.cudatoolkit9.override {
cudatoolkit_9 = pkgs.cudatoolkit_9.override {
gcc6 = pkgs.gcc5;
};
in callPackage ../development/python-modules/pytorch {
cudaSupport = pkgs.config.cudaSupport or false;
cudatoolkit = cudatoolkit9;
cudnn = pkgs.cudnn_cudatoolkit9.override {
inherit cudatoolkit9;
cudatoolkit = cudatoolkit_9;
cudnn = pkgs.cudnn_cudatoolkit_9.override {
inherit cudatoolkit_9;
};
};
@ -17583,8 +17583,8 @@ EOF
else callPackage ../development/python-modules/tensorflow rec {
cudaSupport = pkgs.config.cudaSupport or false;
inherit (pkgs.linuxPackages) nvidia_x11;
cudatoolkit = pkgs.cudatoolkit9;
cudnn = pkgs.cudnn_cudatoolkit9;
cudatoolkit = pkgs.cudatoolkit_9;
cudnn = pkgs.cudnn_cudatoolkit_9;
};
tensorflowWithoutCuda = self.tensorflow.override {