git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #164712 from rehno-lindeque/pytorch-1.11.0

pytorch-bin: 1.10.0 -> 1.11.0

commit077f078a01cab74ca1f33520156b281fc9a3ca43 authorSamuel Ainsworth <skainsworth@gmail.com> dateThu 24 Mar 2022, 09:16 (5 years ago) parent6d146fb163450e
11 files changed+207−70
compare with master
unifiedsplit
pkgs/development/python-modules/coqui-trainer/default.nix+15−6 pkgs/development/python-modules/pytorch/bin.nix+3−2 pkgs/development/python-modules/pytorch/binary-hashes.nix+40−25 pkgs/development/python-modules/pytorch/prefetch.sh+13−4 pkgs/development/python-modules/torchaudio/bin.nix+6−2 pkgs/development/python-modules/torchaudio/binary-hashes.nix+50−10 pkgs/development/python-modules/torchaudio/prefetch.sh+13−4 pkgs/development/python-modules/torchvision/bin.nix+3−2 pkgs/development/python-modules/torchvision/binary-hashes.nix+50−10 pkgs/development/python-modules/torchvision/prefetch.sh+13−4 pkgs/tools/audio/tts/default.nix+1−1
pkgs/development/python-modules/coqui-trainer/default.nix+15−6
@@ -1,15 +1,16 @@
11{ lib
22, buildPythonPackage
3+, fetchpatch
34, fetchFromGitHub
5+, pythonAtLeast
46
57, coqpit
68, fsspec
7−, pytorch
9+, pytorch-bin
810
911, pytestCheckHook
1012, soundfile
11−, tensorboardx
12−, torchvision
13+, torchvision-bin
1314}:
1415
1516let
@@ -20,6 +21,8 @@ buildPythonPackage {
2021 inherit pname version;
2122 format = "pyproject";
2223
24+ disabled = pythonAtLeast "3.10"; # https://github.com/coqui-ai/Trainer/issues/22
25+
2326 src = fetchFromGitHub {
2427 owner = "coqui-ai";
2528 repo = "Trainer";
@@ -27,12 +30,18 @@ buildPythonPackage {
2730 hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY=";
2831 };
2932
33+ patches = [
34+ (fetchpatch {
35+ url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch";
36+ sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2";
37+ })
38+ ];
39+
3040 propagatedBuildInputs = [
3141 coqpit
3242 fsspec
33− pytorch
43+ pytorch-bin
3444 soundfile
35− tensorboardx
3645 ];
3746
3847 # only one test and that requires training data from the internet
@@ -40,7 +49,7 @@ buildPythonPackage {
4049
4150 checkInputs = [
4251 pytestCheckHook
43− torchvision
52+ torchvision-bin
4453 ];
4554
4655 pythonImportsCheck = [
pkgs/development/python-modules/pytorch/bin.nix+3−2
@@ -4,6 +4,7 @@
44, isPy37
55, isPy38
66, isPy39
7+, isPy310
78, python
89, addOpenGLRunpath
910, future
@@ -19,7 +20,7 @@ let
1920 pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
2021 srcs = import ./binary-hashes.nix version;
2122 unsupported = throw "Unsupported system";
22− version = "1.10.0";
23+ version = "1.11.0";
2324in buildPythonPackage {
2425 inherit version;
2526
@@ -28,7 +29,7 @@ in buildPythonPackage {
2829
2930 format = "wheel";
3031
31− disabled = !(isPy37 || isPy38 || isPy39);
32+ disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
3233
3334 src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
3435
pkgs/development/python-modules/pytorch/binary-hashes.nix+40−25
@@ -6,46 +6,61 @@
66# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
77
88version : builtins.getAttr version {
9− "1.10.0" = {
9+ "1.11.0" = {
1010 x86_64-linux-37 = {
11− name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl";
12− url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13− hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg=";
11+ name = "torch-1.11.0-cp37-cp37m-linux_x86_64.whl";
12+ url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13+ hash = "sha256-9WMzRw2uo8lweLN2B+ADXMz3L8XDb9hFRuGkuNmUTys=";
1414 };
1515 x86_64-linux-38 = {
16− name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl";
17− url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl";
18− hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM=";
16+ name = "torch-1.11.0-cp38-cp38-linux_x86_64.whl";
17+ url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl";
18+ hash = "sha256-tqeZvbbuPZFOXmK920J21KECSMGvTy0hdzjl+e4nSFs=";
1919 };
2020 x86_64-linux-39 = {
21− name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl";
22− url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
23− hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg=";
21+ name = "torch-1.11.0-cp39-cp39-linux_x86_64.whl";
22+ url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
23+ hash = "sha256-6RJrCl2VcEvuQKnQ7xy9gtjceGPkY4o3a+9wLf1lk3A=";
24+ };
25+ x86_64-linux-310 = {
26+ name = "torch-1.11.0-cp310-cp310-linux_x86_64.whl";
27+ url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl";
28+ hash = "sha256-powzZXpUYTHrm8ROKpjS+nBKr66GFGCwUbgoE4Usy0Q=";
2429 };
2530 x86_64-darwin-37 = {
26− name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
27− url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
28− hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE=";
31+ name = "torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl";
32+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl";
33+ hash = "sha256-aGCx0b8LsLZ6a9R/haDkyCW1GO6hO11hAZmdu8vVvAw=";
2934 };
3035 x86_64-darwin-38 = {
31− name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
32− url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
33− hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I=";
36+ name = "torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl";
37+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl";
38+ hash = "sha256-DMyFzQYiej7fgJ4seV/Vdiw9Too4tcn3RMbnz4QTYbs=";
3439 };
3540 x86_64-darwin-39 = {
36− name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
37− url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
38− hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw=";
41+ name = "torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl";
42+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl";
43+ hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ=";
44+ };
45+ x86_64-darwin-310 = {
46+ name = "torch-1.11.0-cp310-none-macosx_10_9_x86_64.whl";
47+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl";
48+ hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ=";
3949 };
4050 aarch64-darwin-38 = {
41− name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
42− url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
43− hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ=";
51+ name = "torch-1.11.0-cp38-none-macosx_11_0_arm64.whl";
52+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_11_0_arm64.whl";
53+ hash = "sha256-wVVOSddPGyw+cgLXcFa6LddGVDdYW6xkBitYD3FKROk=";
4454 };
4555 aarch64-darwin-39 = {
46− name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
47− url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
48− hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY=";
56+ name = "torch-1.11.0-cp39-none-macosx_11_0_arm64.whl";
57+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl";
58+ hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E=";
59+ };
60+ aarch64-darwin-310 = {
61+ name = "torch-1.11.0-cp310-none-macosx_11_0_arm64.whl";
62+ url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl";
63+ hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E=";
4964 };
5065 };
5166}
pkgs/development/python-modules/pytorch/prefetch.sh+13−4
@@ -5,12 +5,21 @@ set -eou pipefail
55
66version=$1
77
8−bucket="https://download.pytorch.org/whl/cu113"
8+linux_bucket="https://download.pytorch.org/whl/cu113"
9+darwin_bucket="https://download.pytorch.org/whl/cpu"
910
1011url_and_key_list=(
11− "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"
12− "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
13− "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
12+ "x86_64-linux-37 $linux_bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"
13+ "x86_64-linux-38 $linux_bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
14+ "x86_64-linux-39 $linux_bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
15+ "x86_64-linux-310 $linux_bucket/torch-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
16+ "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl"
17+ "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl"
18+ "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl"
19+ "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl"
20+ "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
21+ "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
22+ "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
1423)
1524
1625hashfile="binary-hashes-$version.nix"
pkgs/development/python-modules/torchaudio/bin.nix+6−2
@@ -2,6 +2,10 @@
22, stdenv
33, buildPythonPackage
44, fetchurl
5+, isPy37
6+, isPy38
7+, isPy39
8+, isPy310
59, python
610, pytorch-bin
711, pythonOlder
@@ -10,7 +14,7 @@
1014
1115buildPythonPackage rec {
1216 pname = "torchaudio";
13− version = "0.10.0";
17+ version = "0.11.0";
1418 format = "wheel";
1519
1620 src =
@@ -19,7 +23,7 @@ buildPythonPackage rec {
1923 srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
2024 in fetchurl srcs;
2125
22− disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10");
26+ disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
2327
2428 propagatedBuildInputs = [
2529 pytorch-bin
pkgs/development/python-modules/torchaudio/binary-hashes.nix+50−10
@@ -6,21 +6,61 @@
66# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
77
88version : builtins.getAttr version {
9− "0.10.0" = {
9+ "0.11.0" = {
1010 x86_64-linux-37 = {
11− name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl";
12− url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13− hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw=";
11+ name = "torchaudio-0.11.0-cp37-cp37m-linux_x86_64.whl";
12+ url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13+ hash = "sha256-AdqgntXh2rTD7rBePshFAQ2tVl7b+734wG4r471/Y2U=";
1414 };
1515 x86_64-linux-38 = {
16− name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl";
17− url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl";
18− hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI=";
16+ name = "torchaudio-0.11.0-cp38-cp38-linux_x86_64.whl";
17+ url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl";
18+ hash = "sha256-zuCHDpz3bkOUjYWprqX9VXoUbXfR8Vhdf1VFfOUg8z4=";
1919 };
2020 x86_64-linux-39 = {
21− name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl";
22− url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
23− hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA=";
21+ name = "torchaudio-0.11.0-cp39-cp39-linux_x86_64.whl";
22+ url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
23+ hash = "sha256-btI9TpsOjeLnIz6J56avNv4poJTpXjjhDbMy6+ZFQvI=";
24+ };
25+ x86_64-linux-310 = {
26+ name = "torchaudio-0.11.0-cp310-cp310-linux_x86_64.whl";
27+ url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl";
28+ hash = "sha256-Zk+AWytEXfJ+HM69BAPhVsvN6pgQwC6uaW7Xux2row4=";
29+ };
30+ x86_64-darwin-37 = {
31+ name = "torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl";
32+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl";
33+ hash = "sha256-uaTT4athEWHAZe0hBoBIM/9LhfZNhAIexZBGg2MWn50=";
34+ };
35+ x86_64-darwin-38 = {
36+ name = "torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl";
37+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl";
38+ hash = "sha256-9OndqejTzgu9XnkZJiGfUFS4uFNlx5vi7pAzOs+a2/w=";
39+ };
40+ x86_64-darwin-39 = {
41+ name = "torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl";
42+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl";
43+ hash = "sha256-cNi8B/J3YI0jqaoI2z+68DVmAlS8EtmzYWQMRVZ3dVk=";
44+ };
45+ x86_64-darwin-310 = {
46+ name = "torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl";
47+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl";
48+ hash = "sha256-g2Pj2wqK9YIP19O/g5agryPcgiHJqdS2Di44mAVJKUQ=";
49+ };
50+ aarch64-darwin-38 = {
51+ name = "torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl";
52+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl";
53+ hash = "sha256-MX/Y7Dn92zrx2tkGWTuezcPt9o5/V4DEL43pVlha5IA=";
54+ };
55+ aarch64-darwin-39 = {
56+ name = "torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl";
57+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl";
58+ hash = "sha256-5eVRP83VeHAGGWW++/B2V4eyX0mcPgC1j02ETkQYMXc=";
59+ };
60+ aarch64-darwin-310 = {
61+ name = "torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl";
62+ url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl";
63+ hash = "sha256-06OyzOuV8E7ZNtozvFO9Zm2rBxWnnbM65HGYUiQdwtI=";
2464 };
2565 };
2666}
pkgs/development/python-modules/torchaudio/prefetch.sh+13−4
@@ -5,12 +5,21 @@ set -eou pipefail
55
66version=$1
77
8−bucket="https://download.pytorch.org/whl/cu113"
8+linux_bucket="https://download.pytorch.org/whl/cu113"
9+darwin_bucket="https://download.pytorch.org/whl"
910
1011url_and_key_list=(
11− "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl"
12− "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
13− "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
12+ "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl"
13+ "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
14+ "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
15+ "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
16+ "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl"
17+ "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl"
18+ "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl"
19+ "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl"
20+ "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl"
21+ "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
22+ "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
1423)
1524
1625hashfile=binary-hashes-"$version".nix
pkgs/development/python-modules/torchvision/bin.nix+3−2
@@ -5,6 +5,7 @@
55, isPy37
66, isPy38
77, isPy39
8+, isPy310
89, patchelf
910, pillow
1011, python
@@ -15,7 +16,7 @@ let
1516 pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
1617 srcs = import ./binary-hashes.nix version;
1718 unsupported = throw "Unsupported system";
18− version = "0.11.1";
19+ version = "0.12.0";
1920in buildPythonPackage {
2021 inherit version;
2122
@@ -25,7 +26,7 @@ in buildPythonPackage {
2526
2627 src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
2728
28− disabled = !(isPy37 || isPy38 || isPy39);
29+ disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
2930
3031 nativeBuildInputs = [
3132 patchelf
pkgs/development/python-modules/torchvision/binary-hashes.nix+50−10
@@ -6,21 +6,61 @@
66# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
77
88version : builtins.getAttr version {
9− "0.11.1" = {
9+ "0.12.0" = {
1010 x86_64-linux-37 = {
11− name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl";
12− url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13− hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I=";
11+ name = "torchvision-0.12.0-cp37-cp37m-linux_x86_64.whl";
12+ url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp37-cp37m-linux_x86_64.whl";
13+ hash = "sha256-i/qktZT+5HQYQjtTHtxOV751DcsP9AHMsSV9/svsGzA=";
1414 };
1515 x86_64-linux-38 = {
16− name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl";
17− url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl";
18− hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE=";
16+ name = "torchvision-0.12.0-cp38-cp38-linux_x86_64.whl";
17+ url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp38-cp38-linux_x86_64.whl";
18+ hash = "sha256-NxM+jFsOwvAZmeWRFvbQ422a+xx/j1i9DD3ImW+DVBk=";
1919 };
2020 x86_64-linux-39 = {
21− name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl";
22− url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl";
23− hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc=";
21+ name = "torchvision-0.12.0-cp39-cp39-linux_x86_64.whl";
22+ url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
23+ hash = "sha256-bGO5q+KEnv7SexmbbUWaIbsBcIxyDbL8pevZQbLwDbg=";
24+ };
25+ x86_64-linux-310 = {
26+ name = "torchvision-0.12.0-cp310-cp310-linux_x86_64.whl";
27+ url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp310-cp310-linux_x86_64.whl";
28+ hash = "sha256-ocsGOHa967HcZGV+1omD/xMHufmoi166Yg2Hr+SEhfE=";
29+ };
30+ x86_64-darwin-37 = {
31+ name = "torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl";
32+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl";
33+ hash = "sha256-GJM7xZf0VjmTJJcZqWqV28fTN0yQ+7MNPafVGPOv60I=";
34+ };
35+ x86_64-darwin-38 = {
36+ name = "torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl";
37+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl";
38+ hash = "sha256-DWAuCb1Fc2/y55aOjduw7s6Vb/ltcVSLGxtIeP33S9g=";
39+ };
40+ x86_64-darwin-39 = {
41+ name = "torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl";
42+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl";
43+ hash = "sha256-RMye+ZLS4qtjsIg/fezrwiRNupO3JUe6EfV6yEUvbq0=";
44+ };
45+ x86_64-darwin-310 = {
46+ name = "torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl";
47+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl";
48+ hash = "sha256-aTZW5nkLarIeSm6H6BwpgrrZ5FW16yThS7ZyOC7GEw8=";
49+ };
50+ aarch64-darwin-38 = {
51+ name = "torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl";
52+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl";
53+ hash = "sha256-n0JCD38LKc09YXdt8xV4JyV6DPFrLAJ3bcFslquxJW0=";
54+ };
55+ aarch64-darwin-39 = {
56+ name = "torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl";
57+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl";
58+ hash = "sha256-adgvR7Z7rW3cu4eDO6WVCmwnG6l7quTAlVYQBxvwNPU=";
59+ };
60+ aarch64-darwin-310 = {
61+ name = "torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl";
62+ url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl";
63+ hash = "sha256-oL5FAcoLobGVZEySQ/SaHEmiblKn83kkxCOdC/XsvY0=";
2464 };
2565 };
2666}
pkgs/development/python-modules/torchvision/prefetch.sh+13−4
@@ -5,12 +5,21 @@ set -eou pipefail
55
66version=$1
77
8−bucket="https://download.pytorch.org/whl/cu113"
8+linux_bucket="https://download.pytorch.org/whl/cu113"
9+darwin_bucket="https://download.pytorch.org/whl"
910
1011url_and_key_list=(
11− "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"
12− "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
13− "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
12+ "x86_64-linux-37 $linux_bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"
13+ "x86_64-linux-38 $linux_bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
14+ "x86_64-linux-39 $linux_bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
15+ "x86_64-linux-310 $linux_bucket/torchvision-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
16+ "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"
17+ "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"
18+ "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"
19+ "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"
20+ "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
21+ "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
22+ "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
1423)
1524
1625hashfile="binary-hashes-$version.nix"
pkgs/tools/audio/tts/default.nix+1−1
@@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec {
5757 ''-e 's/${package}.*[<>=]+.*/${package}/g' \''
5858 ) relaxedConstraints)}
5959 requirements.txt
60+ sed -i '/tensorboardX/d' requirements.txt
6061 '';
6162
6263 nativeBuildInputs = with python.pkgs; [
@@ -84,7 +85,6 @@ python.pkgs.buildPythonApplication rec {
8485 pyworld
8586 scipy
8687 soundfile
87− tensorboardx
8888 tensorflow
8989 torchaudio-bin
9090 tqdm