#328 + remove TH_BINARY_BUILD

recipe/meta.yaml

@@ -45,28 +45,25 @@ source:
     - patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch
     # https://github.com/pytorch/pytorch/pull/137331
     - patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch
-    # conda-specific patch, upstream force-disables libcufile w/ TH_BINARY_BUILD
-    # for their PyPI wheel builds
-    - patches/0008-Allow-libcufile-for-conda-builds.patch
     # conda-specific patch, lets us override CUDA paths
-    - patches/0009-Allow-overriding-CUDA-related-paths.patch
+    - patches/0008-Allow-overriding-CUDA-related-paths.patch
     # NumPy 2 fixes:
     # https://github.com/pytorch/pytorch/pull/136800
-    - patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch
+    - patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch
     # https://github.com/pytorch/pytorch/pull/137740
-    - patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch
+    - patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch
     # fix BLAS calling convention for openblas
-    - patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch
+    - patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch
     # fix mkl-2024 issue
     # https://github.com/pytorch/pytorch/pull/143894
-    - patches/0013-fix-issue-142484.patch
-    - patches/0014-Fix-FindOpenBLAS.patch
+    - patches/0012-fix-issue-142484.patch
+    - patches/0013-Fix-FindOpenBLAS.patch
     # backport https://github.com/pytorch/pytorch/pull/138095
-    - patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch
+    - patches/0014-CD-Enable-Python-3.13-on-windows-138095.patch
     # backport https://github.com/pytorch/pytorch/pull/145480
-    - patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch
+    - patches/0015-simplify-torch.utils.cpp_extension.include_paths-use.patch
     # point to headers that are now living in $PREFIX/include instead of $SP_DIR/torch/include
-    - patches/0017-point-include-paths-to-PREFIX-include.patch
+    - patches/0016-point-include-paths-to-PREFIX-include.patch
 
 build:
   number: {{ build }}

recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch

@@ -1,14 +1,14 @@
-From f3a0f9aab6dce56eea590b946f60256014b61bf7 Mon Sep 17 00:00:00 2001
+From 756045fca376345e48afb6a868b502dbfa0c584c Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <[email protected]>
 Date: Sun, 1 Sep 2024 17:35:40 -0400
-Subject: [PATCH 01/17] Force usage of python 3 and error without numpy
+Subject: [PATCH 01/16] Force usage of python 3 and error without numpy
 
 ---
  cmake/Dependencies.cmake | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index e78305e0a8e..15c62548601 100644
+index e78305e0a..15c625486 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
 @@ -861,9 +861,9 @@ if(BUILD_PYTHON)
@@ -32,3 +32,6 @@ index e78305e0a8e..15c62548601 100644
          caffe2_update_option(USE_NUMPY OFF)
        else()
          caffe2_update_option(USE_NUMPY ON)
+-- 
+2.48.1
+

recipe/patches/0002-Help-find-numpy.patch

@@ -1,14 +1,14 @@
-From 21c30036b5b86f403c0cf4426165d9a6a50edb1a Mon Sep 17 00:00:00 2001
+From 70661ad52cb2f0290de3e0758f240560e4b1e769 Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <[email protected]>
 Date: Tue, 1 Oct 2024 00:28:40 -0400
-Subject: [PATCH 02/17] Help find numpy
+Subject: [PATCH 02/16] Help find numpy
 
 ---
  tools/setup_helpers/cmake.py | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
-index 4b605fe5975..bde41323c76 100644
+index 4b605fe59..bde41323c 100644
 --- a/tools/setup_helpers/cmake.py
 +++ b/tools/setup_helpers/cmake.py
 @@ -305,9 +305,15 @@ class CMake:
@@ -27,3 +27,6 @@ index 4b605fe5975..bde41323c76 100644
              TORCH_BUILD_VERSION=version,
              **build_options,
          )
+-- 
+2.48.1
+

recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch

@@ -1,7 +1,7 @@
-From d1826af525db41eda5020a1404f5d5521d67a5dc Mon Sep 17 00:00:00 2001
+From 4ae61d17c81e9d66e091c2790ac6deae6bf31204 Mon Sep 17 00:00:00 2001
 From: Jeongseok Lee <[email protected]>
 Date: Sat, 19 Oct 2024 04:26:01 +0000
-Subject: [PATCH 03/17] Add USE_SYSTEM_NVTX option (#138287)
+Subject: [PATCH 03/16] Add USE_SYSTEM_NVTX option (#138287)
 
 ## Summary
 
@@ -21,7 +21,7 @@ Approved by: https://github.com/albanD
  3 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 98593c2de97..ae3c3f2cbd5 100644
+index 98593c2de..ae3c3f2cb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -470,6 +470,7 @@ option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF)
@@ -41,7 +41,7 @@ index 98593c2de97..ae3c3f2cbd5 100644
 
  # /Z7 override option When generating debug symbols, CMake default to use the
 diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake
-index afc1bc12abf..152fbdbe6dd 100644
+index afc1bc12a..152fbdbe6 100644
 --- a/cmake/public/cuda.cmake
 +++ b/cmake/public/cuda.cmake
 @@ -170,7 +170,11 @@ else()
@@ -58,7 +58,7 @@ index afc1bc12abf..152fbdbe6dd 100644
  if(nvtx3_FOUND)
    add_library(torch::nvtx3 INTERFACE IMPORTED)
 diff --git a/setup.py b/setup.py
-index 2b0cfa99d71..7174777ed4e 100644
+index 2b0cfa99d..7174777ed 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -183,7 +183,21 @@
@@ -84,3 +84,6 @@ index 2b0cfa99d71..7174777ed4e 100644
  #
  #   USE_MIMALLOC
  #      Static link mimalloc into C10, and use mimalloc in alloc_cpu & alloc_free.
+-- 
+2.48.1
+

recipe/patches/0004-Update-sympy-version.patch

@@ -1,14 +1,14 @@
-From e3219c5fe8834753b0cf9e92be4d1ef1e874f370 Mon Sep 17 00:00:00 2001
+From 2c6db02c01ad080c8dc8ae0b78be2b93099c2ac8 Mon Sep 17 00:00:00 2001
 From: Jeongseok Lee <[email protected]>
 Date: Thu, 17 Oct 2024 15:04:05 -0700
-Subject: [PATCH 04/17] Update sympy version
+Subject: [PATCH 04/16] Update sympy version
 
 ---
  setup.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 7174777ed4e..65be34e39b1 100644
+index 7174777ed..65be34e39 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -1158,7 +1158,7 @@ def main():
@@ -20,3 +20,6 @@ index 7174777ed4e..65be34e39b1 100644
          "networkx",
          "jinja2",
          "fsspec",
+-- 
+2.48.1
+

recipe/patches/0005-Fix-duplicate-linker-script.patch

@@ -1,14 +1,14 @@
-From 08a1f44fbc81324aa98d720dfb7b87a261923ac2 Mon Sep 17 00:00:00 2001
+From fa5bb8f1acd0195efadc35c8fbb9199be92932d9 Mon Sep 17 00:00:00 2001
 From: Jeongseok Lee <[email protected]>
 Date: Sun, 3 Nov 2024 01:12:36 -0700
-Subject: [PATCH 05/17] Fix duplicate linker script
+Subject: [PATCH 05/16] Fix duplicate linker script
 
 ---
  setup.py | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 65be34e39b1..b0e01e0d1ee 100644
+index 65be34e39..b0e01e0d1 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -1184,7 +1184,9 @@ def main():
@@ -22,3 +22,6 @@ index 65be34e39b1..b0e01e0d1ee 100644
          os.environ["CFLAGS"] = (
              os.getenv("CFLAGS", "") + " -ffunction-sections -fdata-sections"
          )
+-- 
+2.48.1
+

recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch

@@ -1,7 +1,7 @@
-From 15df314a41c69a31c0443254d5552aa1b39d708d Mon Sep 17 00:00:00 2001
+From 6fc695312cd062e13c2482b52ae8d028bd7c043a Mon Sep 17 00:00:00 2001
 From: William Wen <[email protected]>
 Date: Fri, 13 Sep 2024 13:02:33 -0700
-Subject: [PATCH 06/17] fix 3.13 pickle error in serialization.py (#136034)
+Subject: [PATCH 06/16] fix 3.13 pickle error in serialization.py (#136034)
 
 Error encountered when adding dynamo 3.13 support.
 Pull Request resolved: https://github.com/pytorch/pytorch/pull/136034
@@ -11,7 +11,7 @@ Approved by: https://github.com/albanD
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/torch/serialization.py b/torch/serialization.py
-index d936d31d6f5..d937680c031 100644
+index d936d31d6..d937680c0 100644
 --- a/torch/serialization.py
 +++ b/torch/serialization.py
 @@ -1005,8 +1005,12 @@ def _legacy_save(obj, f, pickle_module, pickle_protocol) -> None:
@@ -44,3 +44,6 @@ index d936d31d6f5..d937680c031 100644
      pickler.dump(obj)
      data_value = data_buf.getvalue()
      zip_file.write_record("data.pkl", data_value, len(data_value))
+-- 
+2.48.1
+

recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch

@@ -1,7 +1,7 @@
-From 655f694854c3eafdd631235b60bc6c1b279218ed Mon Sep 17 00:00:00 2001
+From d5c8df70422afa07dc212266d420f923f5887f99 Mon Sep 17 00:00:00 2001
 From: Mark Harfouche <[email protected]>
 Date: Thu, 3 Oct 2024 22:49:56 -0400
-Subject: [PATCH 07/17] Allow users to overwrite ld with environment variables
+Subject: [PATCH 07/16] Allow users to overwrite ld with environment variables
 
 This should help in the case of cross compilation.
 
@@ -11,7 +11,7 @@ xref: https://github.com/conda-forge/pytorch-cpu-feedstock/pull/261
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/tools/setup_helpers/generate_linker_script.py b/tools/setup_helpers/generate_linker_script.py
-index 11c397a9e5f..e66fc197062 100644
+index 11c397a9e..e66fc1970 100644
 --- a/tools/setup_helpers/generate_linker_script.py
 +++ b/tools/setup_helpers/generate_linker_script.py
 @@ -1,3 +1,4 @@
@@ -30,3 +30,6 @@ index 11c397a9e5f..e66fc197062 100644
          "\n"
      )
 
+-- 
+2.48.1
+

recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch → recipe/patches/0008-Allow-overriding-CUDA-related-paths.patch

@@ -1,15 +1,15 @@
-From 52e530f222f2d30531c8da889695ac2674964245 Mon Sep 17 00:00:00 2001
+From da7b07f8e3165bf89b08b5a716e539ae9a7afb1a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
 Date: Wed, 27 Nov 2024 13:47:23 +0100
-Subject: [PATCH 09/17] Allow overriding CUDA-related paths
+Subject: [PATCH 08/16] Allow overriding CUDA-related paths
 
 ---
  cmake/Modules/FindCUDAToolkit.cmake | 2 +-
  tools/setup_helpers/cmake.py        | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/Modules/FindCUDAToolkit.cmake b/cmake/Modules/FindCUDAToolkit.cmake
-index ec9ae530aa6..b7c0bd9fc51 100644
+index ec9ae530a..b7c0bd9fc 100644
 --- a/cmake/Modules/FindCUDAToolkit.cmake
 +++ b/cmake/Modules/FindCUDAToolkit.cmake
 @@ -497,7 +497,7 @@ Result variables
@@ -22,7 +22,7 @@ index ec9ae530aa6..b7c0bd9fc51 100644
    set(CUDAToolkit_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_LIBRARY_ROOT}")
    set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_TOOLKIT_VERSION}")
 diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
-index bde41323c76..b171837cd4a 100644
+index bde41323c..b171837cd 100644
 --- a/tools/setup_helpers/cmake.py
 +++ b/tools/setup_helpers/cmake.py
 @@ -252,7 +252,7 @@ class CMake:
@@ -34,3 +34,6 @@ index bde41323c76..b171837cd4a 100644
                  ("EXITCODE", "EXITCODE__TRYRUN_OUTPUT")
              ):
                  build_options[var] = val
+-- 
+2.48.1
+

recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch → recipe/patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch

@@ -1,7 +1,7 @@
-From db0902077a0ef68d0a48ae42f3b60f9cff7b2248 Mon Sep 17 00:00:00 2001
+From 3429795de33cac2e508397dd2d9f5f5c96f185c3 Mon Sep 17 00:00:00 2001
 From: Haifeng Jin <[email protected]>
 Date: Tue, 1 Oct 2024 07:53:24 +0000
-Subject: [PATCH 10/17] Fix test/test_linalg.py for NumPy 2 (#136800)
+Subject: [PATCH 09/16] Fix test/test_linalg.py for NumPy 2 (#136800)
 
 Related to  #107302.
 
@@ -36,7 +36,7 @@ Approved by: https://github.com/lezcano
  1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/test/test_linalg.py b/test/test_linalg.py
-index e9ec874d695..060bccef2e5 100644
+index e9ec874d6..060bccef2 100644
 --- a/test/test_linalg.py
 +++ b/test/test_linalg.py
 @@ -2351,7 +2351,7 @@ class TestLinalg(TestCase):
@@ -75,3 +75,6 @@ index e9ec874d695..060bccef2e5 100644
                      reflectors_i[:] = reflectors_tmp.T
                  reflectors = reflectors.view(*A_cpu.shape)
                  tau = tau.view(tau_shape)
+-- 
+2.48.1
+

recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch → recipe/patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch

@@ -1,7 +1,7 @@
-From a1ced1daa37fdcf5345aa0c3095cab8674c1cded Mon Sep 17 00:00:00 2001
+From a8ddbe6b682347fdc86c5052b244df4f95b926ac Mon Sep 17 00:00:00 2001
 From: Haifeng Jin <[email protected]>
 Date: Sat, 12 Oct 2024 02:40:17 +0000
-Subject: [PATCH 11/17] Fixes NumPy 2 test failures in test_torch.py (#137740)
+Subject: [PATCH 10/16] Fixes NumPy 2 test failures in test_torch.py (#137740)
 
 Related to #107302
 
@@ -24,7 +24,7 @@ Approved by: https://github.com/ezyang
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/test/test_torch.py b/test/test_torch.py
-index be4d6180819..c6fd6ac9f19 100644
+index be4d61808..c6fd6ac9f 100644
 --- a/test/test_torch.py
 +++ b/test/test_torch.py
 @@ -2891,7 +2891,7 @@ else:
@@ -58,3 +58,6 @@ index be4d6180819..c6fd6ac9f19 100644
          )
 
      @skipIfTorchDynamo("np.float64 restored as float32 after graph break.")
+-- 
+2.48.1
+

recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch → recipe/patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch

@@ -1,7 +1,7 @@
-From e74a39d09953d4c4dd293e167121cfe83fb172ec Mon Sep 17 00:00:00 2001
+From 113c9ebec11cba2f1d43bfd4ac03eb02c5c921a8 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <[email protected]>
 Date: Wed, 18 Dec 2024 03:59:00 +0000
-Subject: [PATCH 12/17] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds
+Subject: [PATCH 11/16] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds
 
 There are two calling conventions for *dotu functions
 
@@ -31,7 +31,7 @@ functional calls.
  1 file changed, 1 insertion(+)
 
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index 15c62548601..3965416eb29 100644
+index 15c625486..3965416eb 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
 @@ -182,6 +182,7 @@ elseif(BLAS STREQUAL "OpenBLAS")
@@ -42,3 +42,6 @@ index 15c62548601..3965416eb29 100644
  elseif(BLAS STREQUAL "BLIS")
    find_package(BLIS REQUIRED)
    include_directories(SYSTEM ${BLIS_INCLUDE_DIR})
+-- 
+2.48.1
+

recipe/patches/0013-fix-issue-142484.patch → recipe/patches/0012-fix-issue-142484.patch

@@ -1,15 +1,15 @@
-From 67b122f715e93592f1d7913ab970619f7b571b96 Mon Sep 17 00:00:00 2001
+From 323bb15a6b1f601d79211bd292c26cb886a5d60e Mon Sep 17 00:00:00 2001
 From: "Zheng, Zhaoqiong" <[email protected]>
 Date: Fri, 27 Dec 2024 13:49:36 +0800
-Subject: [PATCH 13/17] fix issue 142484
+Subject: [PATCH 12/16] fix issue 142484
 
 From https://github.com/pytorch/pytorch/pull/143894
 ---
  aten/src/ATen/native/mkl/SpectralOps.cpp | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/aten/src/ATen/native/mkl/SpectralOps.cpp b/aten/src/ATen/native/mkl/SpectralOps.cpp
-index e26cfbf6d8e..c61b76d3205 100644
+index e26cfbf6d..c61b76d32 100644
 --- a/aten/src/ATen/native/mkl/SpectralOps.cpp
 +++ b/aten/src/ATen/native/mkl/SpectralOps.cpp
 @@ -477,7 +477,17 @@ static Tensor& _exec_fft(Tensor& out, const Tensor& self, IntArrayRef out_sizes,
@@ -31,3 +31,6 @@ index e26cfbf6d8e..c61b76d3205 100644
    auto descriptor = _plan_mkl_fft(
        input.strides(), out.strides(), signal_size, input.is_complex(),
        out.is_complex(), normalization, forward, value_type);
+-- 
+2.48.1
+