diff options
author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2018-05-31 09:12:59 +0200 |
---|---|---|
committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2018-05-31 22:21:53 +0200 |
commit | 9e730ee2543dae09d8121a35b148689ceee207a4 (patch) | |
tree | 7744a370d3a0065024185c2054780e817be65723 /pkgs/top-level | |
parent | 1f14408b0e499dcc5faf656c1d7c8b21b520a72c (diff) | |
download | nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar.gz nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar.bz2 nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar.lz nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar.xz nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.tar.zst nixlib-9e730ee2543dae09d8121a35b148689ceee207a4.zip |
renaming cudatoolkit version numbers
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 18 |
2 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4dcd0314066..617372ded93e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5849a0bc714..6bf9f27291a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { |