Unverified Commit 80d984e0 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #217497 from mweinelt/torch-bin-aarch64-linux 

torch-bin, torchaudio-bin: Support aarch64-linux
parents ffdae3d3 c571fd22

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

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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 ];

  };

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

+15 −10
Original line number Diff line number Diff line
@@ -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";
@@ -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";
@@ -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=";

    };

  };

}

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

+8 −6
Original line number Diff line number Diff line
@@ -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"

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

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ buildPythonPackage rec { 
        srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;

    in fetchurl srcs;



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

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



  propagatedBuildInputs = [

    torch-bin
@@ -51,7 +51,7 @@ buildPythonPackage rec { 
    # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

    license = licenses.bsd3;

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    platforms = [ "x86_64-linux" ];

    platforms = [ "aarch64-linux" "x86_64-linux" ];

    maintainers = with maintainers; [ junjihashimoto ];

  };

}

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

+15 −10
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 


version : builtins.getAttr version {

  "0.13.1" = {

    x86_64-linux-37 = {

      name = "torchaudio-0.13.1-cp37-cp37m-linux_x86_64.whl";

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

      hash = "sha256-wQJJ2BPkQAGxXx8H0rt3P39wsl/6KhbF27wYHT5L6/o=";

    };

    x86_64-linux-38 = {

      name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
@@ -27,11 +22,6 @@ version : builtins.getAttr version { 
      url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";

      hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY=";

    };

    x86_64-darwin-37 = {

      name = "torchaudio-0.13.1-cp37-cp37m-macosx_10_9_x86_64.whl";

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

      hash = "sha256-D6fMGiswVvxs7ubWDbze9YlVp8pTRmfQ25tPye+gh6E=";

    };

    x86_64-darwin-38 = {

      name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
@@ -62,5 +52,20 @@ version : builtins.getAttr version { 
      url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";

      hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0=";

    };

    aarch64-linux-38 = {

      name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";

      hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c=";

    };

    aarch64-linux-39 = {

      name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";

      hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE=";

    };

    aarch64-linux-310 = {

      name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";

      hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE=";

    };

  };

}