b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #68954 from dguibert/dg/cudatoolkit_10_1

Browse source 
cudatoolkit: add 10.1.243
This commit is contained in:
Andreas Rammhold 2019-11-06 08:58:30 +01:00 committed by GitHub
parent ec6579437c 78aff37ff1
commit 1e72fa5158
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/compilers/cudatoolkit/default.nix
View file

@ -53,22 +53,25 @@ let
unpackPhase = '' unpackPhase = ''
sh $src --keep --noexec sh $src --keep --noexec
cd pkg/run_files ${lib.optionalString (lib.versionOlder version "10.1") ''
sh cuda-linux*.run --keep --noexec cd pkg/run_files
sh cuda-samples*.run --keep --noexec sh cuda-linux*.run --keep --noexec
mv pkg ../../$(basename $src) sh cuda-samples*.run --keep --noexec
cd ../.. mv pkg ../../$(basename $src)
rm -rf pkg cd ../..
rm -rf pkg
for patch in $runPatches; do for patch in $runPatches; do
sh $patch --keep --noexec sh $patch --keep --noexec
mv pkg $(basename $patch) mv pkg $(basename $patch)
done done
''}
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir $out mkdir $out
${lib.optionalString (lib.versionOlder version "10.1") ''
cd $(basename $src) cd $(basename $src)
export PERL5LIB=. export PERL5LIB=.
perl ./install-linux.pl --prefix="$out" perl ./install-linux.pl --prefix="$out"
@ -78,14 +81,22 @@ let
perl ./install_patch.pl --silent --accept-eula --installdir="$out" perl ./install_patch.pl --silent --accept-eula --installdir="$out"
cd .. cd ..
done done
''}
${lib.optionalString (lib.versionAtLeast version "10.1") ''
cd pkg/builds/cuda-toolkit
mv * $out/
''}
rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
${lib.optionalString (lib.versionOlder version "10.1") ''
# let's remove the 32-bit libraries, they confuse the lib64->lib mover # let's remove the 32-bit libraries, they confuse the lib64->lib mover
rm -rf $out/lib rm -rf $out/lib
''}
# Remove some cruft. # Remove some cruft.
${lib.optionalString (lib.versionAtLeast version "7.0") "rm $out/bin/uninstall*"} ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
"rm $out/bin/uninstall*"}
# Fixup path to samples (needed for cuda 6.5 or else nsight will not find them) # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
if [ -d "$out"/cuda-samples ]; then if [ -d "$out"/cuda-samples ]; then
@ -109,6 +120,9 @@ let
# Remove OpenCL libraries as they are provided by ocl-icd and driver. # Remove OpenCL libraries as they are provided by ocl-icd and driver.
rm -f $out/lib64/libOpenCL* rm -f $out/lib64/libOpenCL*
${lib.optionalString (lib.versionAtLeast version "10.1") ''
mv $out/lib64 $out/lib
''}
# Set compiler for NVCC. # Set compiler for NVCC.
wrapProgram $out/bin/nvcc \ wrapProgram $out/bin/nvcc \
@ -302,5 +316,13 @@ in rec {
gcc = gcc7; gcc = gcc7;
}; };
cudatoolkit_10 = cudatoolkit_10_0; cudatoolkit_10_1 = common {
version = "10.1.243";
url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run";
sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7";
gcc = gcc7;
};
cudatoolkit_10 = cudatoolkit_10_1;
} }

11
pkgs/development/libraries/science/math/cudnn/default.nix
View file

@ -1,4 +1,4 @@
{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0 }: { callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1 }:
let let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@ -65,5 +65,12 @@ in rec {
sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf";
}; };
cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0; cudnn_cudatoolkit_10_1 = generic rec {
version = "7.6.3";
cudatoolkit = cudatoolkit_10_1;
srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.3.30.tgz";
sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m";
};
cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1;
} }

10
pkgs/top-level/all-packages.nix
View file

@ -2556,9 +2556,10 @@ in
cudatoolkit_9_1 cudatoolkit_9_1
cudatoolkit_9_2 cudatoolkit_9_2
cudatoolkit_10 cudatoolkit_10
cudatoolkit_10_0; cudatoolkit_10_0
cudatoolkit_10_1;
cudatoolkit = cudatoolkit_9; cudatoolkit = cudatoolkit_10;
inherit (callPackages ../development/libraries/science/math/cudnn { }) inherit (callPackages ../development/libraries/science/math/cudnn { })
cudnn_cudatoolkit_7 cudnn_cudatoolkit_7
@ -2570,9 +2571,10 @@ in
cudnn_cudatoolkit_9_1 cudnn_cudatoolkit_9_1
cudnn_cudatoolkit_9_2 cudnn_cudatoolkit_9_2
cudnn_cudatoolkit_10 cudnn_cudatoolkit_10
cudnn_cudatoolkit_10_0; cudnn_cudatoolkit_10_0
cudnn_cudatoolkit_10_1;
cudnn = cudnn_cudatoolkit_9; cudnn = cudnn_cudatoolkit_10;
curlFull = curl.override { curlFull = curl.override {
idnSupport = true; idnSupport = true;