Unverified Commit db19b287 authored by Someone's avatar Someone Committed by GitHub
Browse files

Merge pull request #285249 from GaetanLepage/torch 

python3Packages.{torch,torch-bin}: 2.1.1 -> 2.2.0
parents 9349d172 fac77e6b

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

+13 −14
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ let 
  pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;

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

  unsupported = throw "Unsupported system";

  version = "2.1.2";

  version = "2.2.0";

in buildPythonPackage {

  inherit version;
@@ -47,6 +47,17 @@ in buildPythonPackage { 
    # $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships

    # libnvToolsExt-$hash.so.1

    cuda_nvtx



    cuda_cudart

    cuda_cupti

    cuda_nvrtc

    cudnn

    libcublas

    libcufft

    libcurand

    libcusolver

    libcusparse

    nccl

  ]);



  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.isLinux [
@@ -79,18 +90,6 @@ in buildPythonPackage { 


  postFixup = lib.optionalString stdenv.isLinux ''

    addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib"



    patchelf $out/${python.sitePackages}/torch/lib/libcudnn.so.8 --add-needed libcudnn_cnn_infer.so.8



    pushd $out/${python.sitePackages}/torch/lib || exit 1

      for LIBNVRTC in ./libnvrtc*

      do

        case "$LIBNVRTC" in

          ./libnvrtc-builtins*) true;;

          ./libnvrtc*) patchelf "$LIBNVRTC" --add-needed libnvrtc-builtins* ;;

        esac

      done

    popd || exit 1

  '';



  # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
@@ -106,7 +105,7 @@ in buildPythonPackage { 
    # https://docs.nvidia.com/cuda/eula/index.html

    # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html

    # torch's license is BSD3.

    # torch-bin includes CUDA and MKL binaries, therefore unfreeRedistributable is set.

    # torch-bin used to vendor CUDA. It still links against CUDA and MKL.

    license = with licenses; [ bsd3 issl unfreeRedistributable ];

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

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

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

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



version : builtins.getAttr version {

  "2.1.2" = {

  "2.2.0" = {

    x86_64-linux-38 = {

      name = "torch-2.1.2-cp38-cp38-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp38-cp38-linux_x86_64.whl";

      hash = "sha256-2qF5u1WPePIWXbl0pnROyN4upx62qvNiva52FgEsAwI=";

      name = "torch-2.2.0-cp38-cp38-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl";

      hash = "sha256-on2vBAW5JDWXlcOaWnP/MRUYgNY/ZePwBRwi+bs7Ix4=";

    };

    x86_64-linux-39 = {

      name = "torch-2.1.2-cp39-cp39-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp39-cp39-linux_x86_64.whl";

      hash = "sha256-6q9pB+NyPAymqR314Bp+74yr7JMSDppQc59aXxSiqkY=";

      name = "torch-2.2.0-cp39-cp39-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl";

      hash = "sha256-ccYx+u1TWJYdL6WCo3Dh0p+L7GT8Autv9vTrLFas/YU=";

    };

    x86_64-linux-310 = {

      name = "torch-2.1.2-cp310-cp310-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp310-cp310-linux_x86_64.whl";

      hash = "sha256-shhLdynvO5sQBlwHSjfB5gP9mfkeODduJct+1uHVRpY=";

      name = "torch-2.2.0-cp310-cp310-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl";

      hash = "sha256-xEECFnLr4uWvvbNIF6qF5tMhMPlN8tqa1Mt4qdS4E3A=";

    };

    x86_64-linux-311 = {

      name = "torch-2.1.2-cp311-cp311-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.1.2%2Bcu121-cp311-cp311-linux_x86_64.whl";

      hash = "sha256-ygXK6TNFBNGQPhbFDd8EUymoWdWxon7S3B1Y7QZt9vo=";

      name = "torch-2.2.0-cp311-cp311-linux_x86_64.whl";

      url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl";

      hash = "sha256-C8Wa5xUo8KYBPxsBZw8DnMbQGyztenIZyhbuGUwwURY=";

    };

    x86_64-darwin-38 = {

      name = "torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_10_9_x86_64.whl";

      hash = "sha256-jiId7M0N72wrrf9r5APgxTSRgF7ZkV4sAprbzbh6trU=";

      name = "torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl";

      hash = "sha256-n6S6LDDsKUolu0t6FaegYSDTqub4+N50A5G9ZSOcgAY=";

    };

    x86_64-darwin-39 = {

      name = "torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_10_9_x86_64.whl";

      hash = "sha256-aYTNUFfAyXezyXVyVOmJ0/EST0zp0HyqbLY3eDxx1Co=";

      name = "torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl";

      hash = "sha256-jTTFeq04rJJTWsryl8vuYDbwMZKGxgJnpKBz4fwWlxg=";

    };

    x86_64-darwin-310 = {

      name = "torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_10_9_x86_64.whl";

      hash = "sha256-2bU1ytDfPROZfb6L1orDPg465Td2OcmIGUjkB5SmFAM=";

      name = "torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl";

      hash = "sha256-Ux4YihpeLVzqPX+bbqviXwOT9k5mTJj26LIYdfIFT5M=";

    };

    x86_64-darwin-311 = {

      name = "torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_10_9_x86_64.whl";

      hash = "sha256-dtN5Z8McmVSK0sTT8s8ZHbSEdvLmmzWgk3E3EW2jVqE=";

      name = "torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl";

      hash = "sha256-yCp8ENobrFoxlWhnHce7+PexfFUfwjPlqAgDurnvDQQ=";

    };

    aarch64-darwin-38 = {

      name = "torch-2.1.2-cp38-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-none-macosx_11_0_arm64.whl";

      hash = "sha256-BbGFlPYKkRoMTwI/OKi9p3Ex+6X9dBvaYm6X3PWj3Qo=";

      name = "torch-2.2.0-cp38-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_11_0_arm64.whl";

      hash = "sha256-TCrIfQcXzbYqkUJTTPCFmFHvONk6KC6dyRUYETp6gDM=";

    };

    aarch64-darwin-39 = {

      name = "torch-2.1.2-cp39-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-none-macosx_11_0_arm64.whl";

      hash = "sha256-vBldeSf+q8DrfBEORXyVXtKrYW88fChDndQYjPWJaZ8=";

      name = "torch-2.2.0-cp39-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_11_0_arm64.whl";

      hash = "sha256-xZuzd7T6xt4wZrqPFZuWAEWLCcwyo/Y9ADDbmVpR/qk=";

    };

    aarch64-darwin-310 = {

      name = "torch-2.1.2-cp310-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-none-macosx_11_0_arm64.whl";

      hash = "sha256-+aVdVa8Cgm6/ut9Om2gvDyd2a8M9+CNrSNKNcFWHho8=";

      name = "torch-2.2.0-cp310-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_11_0_arm64.whl";

      hash = "sha256-kApUIX2bUP0RIVXO11+JCB8jyFqlmLX+A8ng2gDlOSc=";

    };

    aarch64-darwin-311 = {

      name = "torch-2.1.2-cp311-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-none-macosx_11_0_arm64.whl";

      hash = "sha256-4tg/B7SqyYNFPqW/j5qp2s8ieKjTEkf12QN/N778YOQ=";

      name = "torch-2.2.0-cp311-none-macosx_11_0_arm64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_11_0_arm64.whl";

      hash = "sha256-qbGvT92jsrSCTl8SMz19vSJ5EwJBWGly2WrOuYtErJs=";

    };

    aarch64-linux-38 = {

      name = "torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-4yJfR9ULtm91b+kZanaAVdHCawIVTrH3cM5HoleNOqc=";

      name = "torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-pfl3K7le+v2QbeaDEEryMB7xhgjQx/Ny/xpaYb95K4g=";

    };

    aarch64-linux-39 = {

      name = "torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-2TunD2ewjCrlWY7nEcvFRqG8gQLO+TiQS4yFwgiaUaA=";

      name = "torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-5tJVCovq33nOSCcaoqKBF16RowZf7ThdKouYAsKnRNs=";

    };

    aarch64-linux-310 = {

      name = "torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-vvaZbCfY9ukupOE6dy2JYR2g4QO0h5DeeBMeMIz3MHY=";

      name = "torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-GeiXY73Z3wv145Ri6UEMYSp6Rq/3LqKFuXkprCBFEj8=";

    };

    aarch64-linux-311 = {

      name = "torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-jzLOWRYWowME83p9XqgLacqeG5S7p/MIGEv2Fv2uoVU=";

      name = "torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";

      hash = "sha256-TYGa0jWR4M2KPAt0DYTqrm/QmSjPLK3OveiuYFrC24s=";

    };

  };

}

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

+8 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
  Accelerate, CoreServices, libobjc,



  # Propagated build inputs

  astunparse,

  fsspec,

  filelock,

  jinja2,
@@ -126,8 +127,8 @@ let 
in buildPythonPackage rec {

  pname = "torch";

  # Don't forget to update torch-bin to the same version.

  version = "2.1.2";

  format = "setuptools";

  version = "2.2.0";

  pyproject = true;



  disabled = pythonOlder "3.8.0";
@@ -144,7 +145,7 @@ in buildPythonPackage rec { 
    repo = "pytorch";

    rev = "refs/tags/v${version}";

    fetchSubmodules = true;

    hash = "sha256-E/GQCRWBf3hYsDCCk0twaL9gkVOCEQeCvO3Va+jgIdE=";

    hash = "sha256-FfFjgx6yrPEQlF8CLglsWq+zWGr6MD4z0F+lYoy6grc=";

  };



  patches = lib.optionals cudaSupport [
@@ -247,6 +248,9 @@ in buildPythonPackage rec { 
  # Also avoids pytorch exporting the headers of pybind11

  USE_SYSTEM_PYBIND11 = true;



  # NB technical debt: building without NNPACK as workaround for missing `six`

  USE_NNPACK = 0;



  preBuild = ''

    export MAX_JOBS=$NIX_BUILD_CORES

    ${python.pythonOnBuildForHost.interpreter} setup.py build --cmake-only
@@ -383,6 +387,7 @@ in buildPythonPackage rec { 
    ++ lib.optionals rocmSupport [ rocmtoolkit_joined ];



  propagatedBuildInputs = [

    astunparse

    cffi

    click

    numpy

pkgs/development/python-modules/torch/fix-cmake-cuda-toolkit.patch

+8 −22
Original line number Diff line number Diff line 
From aa7e7cfd5a5fe0c839406c1b197b81ef955a7ef5 Mon Sep 17 00:00:00 2001

From: Gaetan Lepage <gaetan@glepage.com>

Date: Thu, 23 Nov 2023 00:39:26 +0100

Subject: [PATCH] fix-cmake-cuda-toolkit



---

 CMakeLists.txt               |  4 ----

 cmake/public/cuda.cmake      | 12 +++++++++---

 tools/setup_helpers/cmake.py |  2 ++

 3 files changed, 11 insertions(+), 7 deletions(-)



diff --git a/CMakeLists.txt b/CMakeLists.txt

index 3a48eaf4e29..3aaeef2593a 100644

index 9194e520bb0..d05fdcfb6cb 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -1152,10 +1152,6 @@ if(BUILD_SHARED_LIBS)

@@ -1160,10 +1160,6 @@ if(BUILD_SHARED_LIBS)

       ${PROJECT_SOURCE_DIR}/cmake/Modules_CUDA_fix

       DESTINATION share/cmake/Caffe2/

       COMPONENT dev)
@@ -25,16 +14,16 @@ index 3a48eaf4e29..3aaeef2593a 100644 
       ${PROJECT_SOURCE_DIR}/cmake/Modules/FindCUSPARSELT.cmake

       DESTINATION share/cmake/Caffe2/

diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake

index 32f3ba375b5..c8b666e4c78 100644

index c7595774d81..4fc43771810 100644

--- a/cmake/public/cuda.cmake

+++ b/cmake/public/cuda.cmake

@@ -62,9 +62,15 @@ cmake_policy(POP)

@@ -61,9 +61,15 @@ find_package(CUDAToolkit REQUIRED)

 cmake_policy(POP)

 

 if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR

     NOT CUDA_INCLUDE_DIRS STREQUAL CUDAToolkit_INCLUDE_DIR)

-  message(FATAL_ERROR "Found two conflicting CUDA installs:\n"

 if(NOT CMAKE_CUDA_COMPILER_VERSION VERSION_EQUAL CUDAToolkit_VERSION)

-  message(FATAL_ERROR "Found two conflicting CUDA versions:\n"

-                      "V${CMAKE_CUDA_COMPILER_VERSION} in '${CUDA_INCLUDE_DIRS}' and\n"

-                      "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIR}'")

-                      "V${CUDAToolkit_VERSION} in '${CUDAToolkit_INCLUDE_DIRS}'")

+  if(CUDA_INCLUDE_DIRS IN_LIST CUDAToolkit_INCLUDE_DIR)

+    message(STATUS "CUDA_INCLUDE_DIRS is a substring of CUDAToolkit_INCLUDE_DIR. "

+                   "Setting CUDA_INCLUDE_DIRS to CUDAToolkit_INCLUDE_DIR.")
@@ -60,6 +49,3 @@ index fb19b66dfba..3f83bef32fe 100644 
                     "CUDA_SEPARABLE_COMPILATION",

                     "CUDNN_LIBRARY",

                     "CUDNN_INCLUDE_DIR",
 
-- 

2.42.0

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


buildPythonPackage rec {

  pname = "torchaudio";

  version = "2.1.2";

  version = "2.2.0";

  format = "wheel";



  src =