Skip to content

Commit

Permalink
python310Packages.torch-bin: Support aarch64-linux
Browse files Browse the repository at this point in the history 
and drop support for Python 3.7, as it was already removed from nixpkgs.
  • Loading branch information
@mweinelt
mweinelt committed Feb 21, 2023
1 parent 9ffd1c3 commit 04f7903
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/torch/bin.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ in buildPythonPackage {

format = "wheel";

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

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

Expand Down Expand Up @@ -76,7 +76,7 @@ in buildPythonPackage {
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
license = licenses.bsd3;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
hydraPlatforms = []; # output size 3.2G on 1.11.0
maintainers = with maintainers; [ junjihashimoto ];
};
Expand Down
25 changes: 15 additions & 10 deletions pkgs/development/python-modules/torch/binary-hashes.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@

version : builtins.getAttr version {
"1.13.1" = {
x86_64-linux-37 = {
name = "torch-1.13.1-cp37-cp37m-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
hash = "sha256-bXg6H3mHFyTK2jw3TKUJiGNZqMSseNBT34mxQu6QREA=";
};
x86_64-linux-38 = {
name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl";
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
Expand All @@ -27,11 +22,6 @@ version : builtins.getAttr version {
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU=";
};
x86_64-darwin-37 = {
name = "torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp37-none-macosx_10_9_x86_64.whl";
hash = "sha256-DZuAYQSM+3jmdbnS6oUDv+MNtD1YNZmuhiaxJjoME4A=";
};
x86_64-darwin-38 = {
name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
Expand Down Expand Up @@ -62,5 +52,20 @@ version : builtins.getAttr version {
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU=";
};
aarch64-linux-38 = {
name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4=";
};
aarch64-linux-39 = {
name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw=";
};
aarch64-linux-310 = {
name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4=";
};
};
}
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/torch/prefetch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,23 @@ set -eou pipefail
version=$1

linux_cuda_version="cu117"
linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
linux_cpu_bucket="https://download.pytorch.org/whl"
darwin_bucket="https://download.pytorch.org/whl/cpu"

url_and_key_list=(
"x86_64-linux-37 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl"
"x86_64-linux-38 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
"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"
"x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
"x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
"x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
"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"
"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"
"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"
"aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
"aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
"aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
"aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl"
"aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl"
"aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl"
)

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

0 comments on commit 04f7903

Please sign in to comment.