git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68954 from dguibert/dg/cudatoolkit_10_1

cudatoolkit: add 10.1.243

commit1e72fa51580dcac77549ffd9e499db6aa74d3286 authorAndreas Rammhold <andreas@rammhold.de> dateWed 6 Nov 2019, 08:58 (7 years ago) parentec6579478aff37
3 files changed+50−19
pkgs/development/compilers/cudatoolkit/default.nix+35−13 pkgs/development/libraries/science/math/cudnn/default.nix+9−2 pkgs/top-level/all-packages.nix+6−4
pkgs/development/compilers/cudatoolkit/default.nix+35−13
@@ -53,22 +53,25 @@ let
5353 unpackPhase = ''
5454 sh $src --keep --noexec
5555
56− cd pkg/run_files
57− sh cuda-linux*.run --keep --noexec
58− sh cuda-samples*.run --keep --noexec
59− mv pkg ../../$(basename $src)
60− cd ../..
61− rm -rf pkg
62−
63− for patch in $runPatches; do
64− sh $patch --keep --noexec
65− mv pkg $(basename $patch)
66− done
56+ ${lib.optionalString (lib.versionOlder version "10.1") ''
57+ cd pkg/run_files
58+ sh cuda-linux*.run --keep --noexec
59+ sh cuda-samples*.run --keep --noexec
60+ mv pkg ../../$(basename $src)
61+ cd ../..
62+ rm -rf pkg
63+
64+ for patch in $runPatches; do
65+ sh $patch --keep --noexec
66+ mv pkg $(basename $patch)
67+ done
68+ ''}
6769 '';
6870
6971 installPhase = ''
7072 runHook preInstall
7173 mkdir $out
74+ ${lib.optionalString (lib.versionOlder version "10.1") ''
7275 cd $(basename $src)
7376 export PERL5LIB=.
7477 perl ./install-linux.pl --prefix="$out"
@@ -78,14 +81,22 @@ let
7881 perl ./install_patch.pl --silent --accept-eula --installdir="$out"
7982 cd ..
8083 done
84+ ''}
85+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
86+ cd pkg/builds/cuda-toolkit
87+ mv * $out/
88+ ''}
8189
8290 rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
8391
92+ ${lib.optionalString (lib.versionOlder version "10.1") ''
8493 # let's remove the 32-bit libraries, they confuse the lib64->lib mover
8594 rm -rf $out/lib
95+ ''}
8696
8797 # Remove some cruft.
88− ${lib.optionalString (lib.versionAtLeast version "7.0") "rm $out/bin/uninstall*"}
98+ ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
99+ "rm $out/bin/uninstall*"}
89100
90101 # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
91102 if [ -d "$out"/cuda-samples ]; then
@@ -109,6 +120,9 @@ let
109120
110121 # Remove OpenCL libraries as they are provided by ocl-icd and driver.
111122 rm -f $out/lib64/libOpenCL*
123+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
124+ mv $out/lib64 $out/lib
125+ ''}
112126
113127 # Set compiler for NVCC.
114128 wrapProgram $out/bin/nvcc \
@@ -302,5 +316,13 @@ in rec {
302316 gcc = gcc7;
303317 };
304318
305− cudatoolkit_10 = cudatoolkit_10_0;
319+ cudatoolkit_10_1 = common {
320+ version = "10.1.243";
321+ url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run";
322+ sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7";
323+
324+ gcc = gcc7;
325+ };
326+
327+ cudatoolkit_10 = cudatoolkit_10_1;
306328}
pkgs/development/libraries/science/math/cudnn/default.nix+9−2
@@ -1,4 +1,4 @@
1−{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_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 }:
22
33let
44 generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -65,5 +65,12 @@ in rec {
6565 sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf";
6666 };
6767
68− cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0;
68+ cudnn_cudatoolkit_10_1 = generic rec {
69+ version = "7.6.3";
70+ cudatoolkit = cudatoolkit_10_1;
71+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.3.30.tgz";
72+ sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m";
73+ };
74+
75+ cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1;
6976}
pkgs/top-level/all-packages.nix+6−4
@@ -2556,9 +2556,10 @@ in
25562556 cudatoolkit_9_1
25572557 cudatoolkit_9_2
25582558 cudatoolkit_10
2559− cudatoolkit_10_0;
2559+ cudatoolkit_10_0
2560+ cudatoolkit_10_1;
25602561
2561− cudatoolkit = cudatoolkit_9;
2562+ cudatoolkit = cudatoolkit_10;
25622563
25632564 inherit (callPackages ../development/libraries/science/math/cudnn { })
25642565 cudnn_cudatoolkit_7
@@ -2570,9 +2571,10 @@ in
25702571 cudnn_cudatoolkit_9_1
25712572 cudnn_cudatoolkit_9_2
25722573 cudnn_cudatoolkit_10
2573− cudnn_cudatoolkit_10_0;
2574+ cudnn_cudatoolkit_10_0
2575+ cudnn_cudatoolkit_10_1;
25742576
2575− cudnn = cudnn_cudatoolkit_9;
2577+ cudnn = cudnn_cudatoolkit_10;
25762578
25772579 curlFull = curl.override {
25782580 idnSupport = true;