Merge pull request #115389 from danieldk/libtorch-bin-cuda11

libtorch-bin: switch to CUDA 11.1, remove static libraries
This commit is contained in:
Daniël de Kok 2021-03-17 13:50:15 +01:00 committed by GitHub
commit e5fce8fd54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -8,8 +8,8 @@
, fixDarwinDylibNames , fixDarwinDylibNames
, cudaSupport , cudaSupport
, cudatoolkit_10_2 , cudatoolkit_11_1
, cudnn_cudatoolkit_10_2 , cudnn_cudatoolkit_11_1
}: }:
let let
@ -38,7 +38,7 @@ in stdenv.mkDerivation {
installPhase = '' installPhase = ''
# Copy headers and CMake files. # Copy headers and CMake files.
install -Dm755 -t $dev/lib lib/*.a mkdir -p $dev
cp -r include $dev cp -r include $dev
cp -r share $dev cp -r share $dev
@ -109,8 +109,8 @@ in stdenv.mkDerivation {
passthru.tests.cmake = callPackage ./test { passthru.tests.cmake = callPackage ./test {
inherit cudaSupport; inherit cudaSupport;
cudatoolkit = cudatoolkit_10_2; cudatoolkit = cudatoolkit_11_1;
cudnn = cudnn_cudatoolkit_10_2; cudnn = cudnn_cudatoolkit_11_1;
}; };
meta = with lib; { meta = with lib; {

View File

@ -8,7 +8,7 @@ version: {
hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc="; hash = "sha256-xBaNyI7eiQnSArHMITonrQQLZnZCZK/SWKOTWnxzdpc=";
}; };
x86_64-linux-cuda = { x86_64-linux-cuda = {
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip"; url = "https://download.pytorch.org/libtorch/cu111/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcu111.zip";
hash = "sha256-rNEyE4+jfeX7cU0aNYd5b0pZGYT0PNPnDnS1PIsrMeM="; hash = "sha256-uQ7ptOuzowJ0JSPIvJHyNotBfpsqAnxpMDLq7Vl6L00=";
}; };
} }