diff options
Diffstat (limited to 'pkgs/development/python-modules/torchvision/default.nix')
-rw-r--r-- | pkgs/development/python-modules/torchvision/default.nix | 88 |
1 files changed, 53 insertions, 35 deletions
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 496a8c08710b0..e00846c824a9f 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -1,15 +1,24 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib -, libjpeg_turbo -, libpng -, ninja -, numpy -, pillow -, pytest -, scipy -, torch -, which +{ + lib, + torch, + buildPythonPackage, + fetchFromGitHub, + + # nativeBuildInputs + libpng, + ninja, + which, + + # buildInputs + libjpeg_turbo, + + # dependencies + numpy, + pillow, + scipy, + + # tests + pytest, }: let @@ -17,7 +26,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.2"; + version = "0.19.1"; in buildPythonPackage { inherit pname version; @@ -26,33 +35,41 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-Y7TkdbdrdiXQO2pBkUePCLw1EYQjsAqkV2OTMzxbU78="; + hash = "sha256-UMBFR/Vw13A+bBfr0p3rRwpCRVMq+ihdlG3C/iuOC30="; }; nativeBuildInputs = [ libpng ninja which - ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_nvcc - ]; + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = [ libjpeg_turbo libpng torch.cxxdev ]; + buildInputs = [ + libjpeg_turbo + libpng + torch.cxxdev + ]; - propagatedBuildInputs = [ numpy pillow torch scipy ]; + dependencies = [ + numpy + pillow + torch + scipy + ]; - preConfigure = '' - export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/" - export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/" - '' - # NOTE: We essentially override the compilers provided by stdenv because we don't have a hook - # for cudaPackages to swap in compilers supported by NVCC. - + lib.optionalString cudaSupport '' - export CC=${backendStdenv.cc}/bin/cc - export CXX=${backendStdenv.cc}/bin/c++ - export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" - export FORCE_CUDA=1 - ''; + preConfigure = + '' + export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/" + export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/" + '' + # NOTE: We essentially override the compilers provided by stdenv because we don't have a hook + # for cudaPackages to swap in compilers supported by NVCC. + + lib.optionalString cudaSupport '' + export CC=${backendStdenv.cc}/bin/cc + export CXX=${backendStdenv.cc}/bin/c++ + export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" + export FORCE_CUDA=1 + ''; # tries to download many datasets for tests doCheck = false; @@ -64,11 +81,12 @@ buildPythonPackage { nativeCheckInputs = [ pytest ]; - meta = with lib; { + meta = { description = "PyTorch vision library"; homepage = "https://pytorch.org/"; - license = licenses.bsd3; - platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with maintainers; [ ericsagnes ]; + changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; + license = lib.licenses.bsd3; + platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; + maintainers = with lib.maintainers; [ ericsagnes ]; }; } |