Commit dc71f104 authored by Gaetan Lepage's avatar Gaetan Lepage
Browse files

python3Packages.torchvision-bin: 0.14.1 -> 0.15.1

parent 64fb4575

pkgs/development/python-modules/torchvision/bin.nix

+17 −16
Original line number Diff line number Diff line 
{ lib

, stdenv

, addOpenGLRunpath

, autoPatchelfHook

, buildPythonPackage

, cudaPackages

, fetchurl

, isPy37

, isPy38

, isPy39

, isPy310

, patchelf

, pythonAtLeast

, pythonOlder

, pillow

, python

, torch-bin
@@ -16,7 +16,7 @@ let 
  pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;

  srcs = import ./binary-hashes.nix version;

  unsupported = throw "Unsupported system";

  version = "0.14.1";

  version = "0.15.1";

in buildPythonPackage {

  inherit version;
@@ -26,10 +26,17 @@ in buildPythonPackage { 


  src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;



  disabled = !(isPy37 || isPy38 || isPy39 || isPy310);

  disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");



  buildInputs = with cudaPackages; [

    # $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships

    # libcudart.$hash.so.11.0

    cuda_cudart

  ];



  nativeBuildInputs = [

    patchelf

    autoPatchelfHook

    addOpenGLRunpath

  ];



  propagatedBuildInputs = [
@@ -42,14 +49,8 @@ in buildPythonPackage { 


  pythonImportsCheck = [ "torchvision" ];



  postFixup = let

    rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];

  in ''

    # Note: after patchelf'ing, libcudart can still not be found. However, this should

    #       not be an issue, because PyTorch is loaded before torchvision and brings

    #       in the necessary symbols.

    patchelf --set-rpath "${rpath}:${torch-bin}/${python.sitePackages}/torch/lib:" \

      "$out/${python.sitePackages}/torchvision/_C.so"

  preInstall = ''

    addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"

  '';



  meta = with lib; {

pkgs/development/python-modules/torchvision/binary-hashes.nix

+42 −37
Original line number Diff line number Diff line
@@ -6,61 +6,66 @@ 
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.



version : builtins.getAttr version {

  "0.14.1" = {

    x86_64-linux-37 = {

      name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";

      hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4=";

    };

  "0.15.1" = {

    x86_64-linux-38 = {

      name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl";

      hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik=";

      name = "torchvision-0.15.1-cp38-cp38-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp38-cp38-linux_x86_64.whl";

      hash = "sha256-kQRzDWVavygsKEXUzUcrsIk288hQg6KK79dq2e6v8mE=";

    };

    x86_64-linux-39 = {

      name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl";

      hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I=";

      name = "torchvision-0.15.1-cp39-cp39-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp39-cp39-linux_x86_64.whl";

      hash = "sha256-Xs4nnI9SH49jc7+XHyrcY6lh1pTErO1TjfgSlCEO5Lo=";

    };

    x86_64-linux-310 = {

      name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl";

      hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM=";

      name = "torchvision-0.15.1-cp310-cp310-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp310-cp310-linux_x86_64.whl";

      hash = "sha256-mmefo3p0EBjIBCNGk7usPUh/s91V7nP2szZ3sXfIwHo=";

    };

    x86_64-darwin-37 = {

      name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";

      hash = "sha256-+3p5P9M84avsJLQneEGaP7HjFZ19/LJ0o8qPuMvECNw=";

    x86_64-linux-311 = {

      name = "torchvision-0.15.1-cp311-cp311-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp311-cp311-linux_x86_64.whl";

      hash = "sha256-nO0skO54K7tBWw3mW8wQ1P6BETGGRnm3B0QsnZ6Kqv0=";

    };

    x86_64-darwin-38 = {

      name = "torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";

      hash = "sha256-aO0DNZ3NPanNIbirlNohFY34pqDFutC/SkLw5EjSjLM=";

      name = "torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";

      hash = "sha256-5YYbqu6ofRm2/X0THhGkpr0XvhQjTEkKJZuzYHdelSA=";

    };

    x86_64-darwin-39 = {

      name = "torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";

      hash = "sha256-xedE9W5fW0Ut61/A8/K6TS8AYS0U2NoNvv6o8JrHaQs=";

      name = "torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";

      hash = "sha256-Hf3sfH35ZzMLujNBp4HgwEfU4BY+ZxZKmRhQA2K/fZE=";

    };

    x86_64-darwin-310 = {

      name = "torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";

      hash = "sha256-7rBd2d069UKP7lJUAHWdr42o5MrsRd3WkIz7NlcfZDM=";

      name = "torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";

      hash = "sha256-vBDUjppg0AbQwbSN6ofx7Jtj2FZzfVkvfFxEzYfz9Lc=";

    };

    x86_64-darwin-311 = {

      name = "torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";

      hash = "sha256-l7kOs7czOjHQScTM/RBkNh6EkYdJWdOPRmr2TWdBjO8=";

    };

    aarch64-darwin-38 = {

      name = "torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";

      hash = "sha256-MPzw6f5X1KxM5kJmWaV9zhmWN8y2xwvhEoZw8XdpJiQ=";

      name = "torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";

      hash = "sha256-5xTzYrnYIXz01oUJtnnryd3xKM/oD2wd744/ihhGbnU=";

    };

    aarch64-darwin-39 = {

      name = "torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";

      hash = "sha256-dYsg0HnoELR0C9YNHrFuSdqDDjNg+b43nrF37iIfpdQ=";

      name = "torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";

      hash = "sha256-wVNxAYbOwDONT/9BFFmlfdvIUEQ2EjynOz8L3Cb/kYw=";

    };

    aarch64-darwin-310 = {

      name = "torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";

      hash = "sha256-jQdm6pKv+nrySOMn3YX3yc/fUaV1MLQyEtThhYVI6dc=";

      name = "torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";

      hash = "sha256-NwjTQQ/cr2KA41jNqd4qSrBswLTA/ZrurFUOwlY6iH4=";

    };

    aarch64-darwin-311 = {

      name = "torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";

      hash = "sha256-a2DhyDmuKgcb77ummxdGjWf+r99XbpD/lkW/vumY3hc=";

    };

  };

}

pkgs/development/python-modules/torchvision/prefetch.sh

+8 −7
Original line number Diff line number Diff line
@@ -5,22 +5,23 @@ set -eou pipefail 


version=$1



linux_cuda_version="cu117"

linux_cuda_version="cu118"

linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"

darwin_bucket="https://download.pytorch.org/whl"

darwin_bucket="https://download.pytorch.org/whl/cpu"



url_and_key_list=(

  "x86_64-linux-37 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"

  "x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"

  "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"

  "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"

  "x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"

  "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"

  "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl"

  "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl"

  "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl"

  "aarch64-darwin-38 $darwin_bucket/cpu/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"

  "aarch64-darwin-39 $darwin_bucket/cpu/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"

  "aarch64-darwin-310 $darwin_bucket/cpu/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"

  "x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl"

  "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"

  "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"

  "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"

  "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"

)



hashfile="binary-hashes-$version.nix"